From 5d7724d7ed230dc2fa67a030c3c0c2ad0e0bdb61 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Thu, 22 Apr 2021 21:15:24 +0100 Subject: [PATCH] Disable hitbox debug, prevent shadowing over stats area on right --- !TheEsc/!RunImage,ff8 | Bin 20996 -> 20740 bytes !TheEsc/c/CTheEscape | 7 ++++--- !TheEsc/c/Mission2 | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 05cc8b50d9d41fc384e3f315f35147470b0a9ab0..981f59ac90d0de4f338e86288c5a6504f807e100 100644 GIT binary patch delta 2887 zcmYjT2~?EV6@K@h`DYklHdzH>fKgCTWOHGaQ9ulW7&Y!&MXMGgZaGa`5Tpj<(UyaX$=uY9 z=>9y6jTlE@tifCbKtLH#FKh_atenLfAn6lFXW#5}3h{M^5K|gfiypiyRzAO0;Hh7^ zux|dEhSkf~E?xtXW27ir#lxgDD&lF9&9E-G#vxuW+4GkNC9w2s#inl2?DjVG>RgHt zc|KW)xH}~LI*Z#|40iK^_FMV7G>VLD)ue@LdN(V?`yD)1b4~h>mE*K2QD?32NRft1~(QW0k+8R2|Ryl)S=3?1K zzu~#Eo%VC1oFOlPi_8u=p62mCHs>akU|X-ryGvX|#+F8EmwW&p_|w`}m!}$)Ook!quVix=|K!>v0D^ADT+j zc~_{tzuhAI4WJ++Cl2B2(SnjrrNmc4;}P(7Xbf3c4jUi(lUXgE-h4h6mP2v;YM5R6 z#>{VrB^qp4Ma^UtUk%HkD@@@-@tYZ*-oF)Ik=fX)c%>&cxo^t?b%$(+=h9I=621+a z%Q3!8b$rS=-0+H7w8kOZd-%4oid>v;ir22k8obaH#SJDMuQ9ElGWMD_QwlFL+o^`P zn{8CUe=%oap|8v}(tQ(WTGA6+O=|6&R023haEl<})>u%X!9BcSNvBWwkYzX>;479i z`j8)4s*LC0pRd)2?VgcJYOuz&cm--ClU_Jnn-&+53OT}hVzJs z-_lI}TSNxv+=z%tZ-$dVCJpN6tB#x9UNy5%j2M>&^_Bz5BO@n9UNl@2BD_qRr z$aFg8Nr)OK8!rn{3uQf^y~;IlsWjiSE^ZG=kHXkAU>|+LZw;7%ElUaCpd4=|Oi6ev zO!(&jk)p9%E6yoLFjiT};cnk@o|!lrw09<^JF3G(D_Hn0t+FYbV3Qy8aZTRbB`*L| zab9sg89kw`QNzkzlWuxJTwp_~O>ZBMhO$x`-)k(iMNj%XXHS_DKOX(U*X*ucvrTx&az<`24 zI)vD+$XN4!2$u|=O`W`N@R!KU3qw+Am*>C`y+jdwBx8?sThAp!Yor@`er;$)+(&xR z+VVKyKZaUZg|`k!coOh`q31h8e+aoM#4i`FSe(sgisI2144LDNje6nlDYK!LT*^y4 zH?z>N5}L3d1O63!D02hld6I_@Bt)*rN|(BHygDmI`clWcvqls> zdTO#WiRSY9oLu8Fo$yyq=v#S-=YyR8YEXCYj?6X9l2N|ZeG}7V{xB!nV;R*>^bfv1 zdO98F?EDBi$L0C;Snou>iA>4bzK?ppAhl6;6l78{KPj-2fs+gEsH^hAUrCCFPZXw- zj;}-Y2|p>!Fig;bAjsu$c2OF&^30+Ibe-QTN>Te#(Rkw}jqvZqO{DJqW6mxvG`t7R zbKeL2r+HoRRBZY}@ksg|Q%SCI3ub;@+DCe$$5E0&l*}u}q;1H@M4iRe9V#|XG=_($`Xcz*SfWi#kvYSlqq`klUYG5Nl|qTxH%U9(`?EBhnli1-vGWkHaFz<<=SpZ%z2Z; z$BmAXQFlX-@!SUizqbkIFdNL%#uZY3-Z3slXBOfM$;l_i?M53DTp22e2O2e)1)P|OYF2BBPR7gR`ey?H2g`*eHV-U%w$Q4wJp9Bor{vKozRW@lHMrIBOCXGbr&6YyI)w|A>4(hCtf5CoE%dEWTAg#$=Ep=QN-#@QvL zZC!I>uq2_^p_?}fXO|YJOX^g#me2o9NjY6%a91g*I;VKn=S&)V_+PmHM%kJUkF+(N zSd6UblRyzP&q3eD*T=_4v{n3^pQPUWG_t-jTW%<}DK0Lq%teb?RT&>G3PNEJ^uq?Q!OC? delta 3105 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 (950)) + if(TilePlayer.location.X > (930)) { TilePlayer.location.X = 100; TilePlayer.mapoffset.X += 10; @@ -416,6 +416,8 @@ int game2_tick() game2_tick_input(); draw_sprite("man",TilePlayer.location.X,TilePlayer.location.Y); + +#ifdef M2_DEBUG_HITBOXES draw_rectangle( (TilePlayer.location.X + TilePlayer.hitbox_bl.X), (TilePlayer.location.Y + TilePlayer.hitbox_bl.Y), @@ -428,6 +430,7 @@ int game2_tick() (TilePlayer.location.X + TilePlayer.drawbox_tr.X), (TilePlayer.location.Y + TilePlayer.drawbox_tr.Y) ); +#endif return 0; }else{ /* screen_flipbuffer();