From 3463d84a585c95e6b675242f84814a177c8e29e0 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 20 Mar 2021 17:21:46 +0000 Subject: [PATCH] Player ship respect hitbox size. --- !RunImage,ff8 | Bin 7464 -> 7500 bytes c/CTheEscape | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/!RunImage,ff8 b/!RunImage,ff8 index 54b9ae1bd98b81577b2de344cc78c6282d74154d..b93a85ca4d1007185849418a2c1796ae3e814d9a 100644 GIT binary patch delta 1408 zcmZ8gZERCj7=F*~y=%)_X(^R0?bgQOEE&j#BjA9nn@)$Dtic4BBXiDaBpQPxl1zU9 zGBGidjh(K}xP@C-O#NZB7HT3G9Ej0Kh#E0*ve@?Sn9gbpiTJ}T)aTrF$>L3(-1mJx z-h0l;J&C4kO*MUi+``FawdSYF=@e!DWsr$ivfG%$8UUZv~KLh4nQ+I;l=tfPw z4BfxTN5Q-$b>|%m6*`bO3FdX_asLCR7arCzlzRj0p!B)_1bYZ8FY6r24T3$$lZt1< z9N5F?4qz??^(@XH+tG}(bLqw`v?e61NW273AHSt|8h!-(OKJK5*uBe=TD@*4NPY`X z_2atH3%$$y`V}yZn5AG%d%!-z;}*~6&%i!cVjly$W7(`~%wm|8glDMaX@jRxCXXb* zrc3M=u=13b*1xHgJPl923UVIie$oy3J4k-ULcS31R)<-U&#N`gF@*QiX?Hv~5C(HIec+s33F&I&fsP7YE zCo&F9Q)x(?hxR;BO~-OJ`cfpN*QIAQhi)9^Rn~1R&%3R4?tSXw)d=C%M z&8E1wd?QY?t-P)wP%IW+1pdBLEJT3=So6Ns0pVwHL5ZIE0Ts1-Lhepj<)iP`1;jg9lotGX1|Wa`AK z-HPI$I`I zsEFt2(Z#S_f#jAR*>|RHtw~v`7RE3Jm;mG>$7X;zAfKA{ZDI9mPZ5QH^*}w)2y6wm O17YA{pdIK0BEWxS{vSF3 delta 1413 zcmZ8he@t6d6h8O;paojjQaV8jZDgB`3`YrOf}34DA z#VnCfyc=6GkjqB28h;EMiE%Ts*(MVC!zGLR9ciD>Y!+io#LOQXe)mxl;!D2VbH498 z=bhfX)2W7dgO^C8B^*TAy*g#xM875by&M@9}r9bU5MAnd`Vwsil1Yi{4lcbk)`+;^Em5~eH#|WB$%%(Jp|?(WaE~8 zFS61WVVnl@iKX8SW*pi3mM-TRXcfk%V1_N-1Lgx{M=jlftQPgh!Ne?G1H+LWwDeml zW&cL~AutD|?wkeFjEY_`UDD(J70gz6SaUSIsd3-H~IT1Y5VLR|R@8^oqk1&3T&m8P&s2s@ncx zu;V#)H7eyTFU((?s~mvmdd{;7p3+604tP{_?}cYMw4(oM^7r>ZTOsT26NX+cjFdvz zhw!0YP-#UrC<~~@aK*Re*Mppfc{>S1eh!j9r&5`pw`qOsPkuwIbiR$^XK2{8Q_MWi zOZ8UgW`%w!86=tjcJdeXd)Oo&((hy+^Uo0n_%*~qKC2&Ly}UPXQ+>kf95EPChN%5B zVm;FibkitmegthBP(cSWc1oIY>2-;;?hwZFyxjI6OY$~bmAh4&UyZPl;M`nxH*o9rTy_Z9 zg?Z|V{ictNm=xb~Bdj5I$IJkWnG{$z{QyrDHde#d~DRbpW)*N-bI%J zbW8)=5Qh>W#|f5~JVrEgj9+$cV8w~*I~vsmrqlg1+sE6AT9ui>#D_&26y@e1zg_&! zfF%B{ zmJ>*B;gNZ8h)C**K#5R!O^L=Q%Ip;v52GvaG9VxMmearlki_4PZzEsho35dLA`P$u U4!{Kz10{eD2ms4~Ag~hn513IKEdT%j diff --git a/c/CTheEscape b/c/CTheEscape index 87f9efe..774b859 100644 --- a/c/CTheEscape +++ b/c/CTheEscape @@ -231,9 +231,9 @@ void game_input_tick() Player.location.X += PLAYER_X_SPEED * (tick - lasttick); Player.sprite = player_shipr; // TODO: SHIP WIDTH - if(Player.location.X > DISPLAY_X) + if((Player.location.X + Player.hitbox_tr.X) > DISPLAY_X) { - Player.location.X = DISPLAY_X; + Player.location.X = DISPLAY_X - Player.hitbox_tr.X; Player.sprite = player_ship; } } @@ -243,9 +243,9 @@ void game_input_tick() { Player.location.X -= PLAYER_X_SPEED * (tick - lasttick); Player.sprite = player_shipl; - if(Player.location.X < 0) + if((Player.location.X + Player.hitbox_bl.X) < 0) { - Player.location.X = 0; + Player.location.X = 0 - Player.hitbox_bl.X; Player.sprite = player_ship; } }