From 46d7b003ded1d417fcaa05cd3debd69a6b370354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Sun, 26 Jul 2020 13:15:06 +0200 Subject: [PATCH] Fix weapon switching --- assets/levelB.gif | Bin 4151 -> 4201 bytes main.c | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/levelB.gif b/assets/levelB.gif index 7a6ffac28fbe359f7ff46d784c25fccb5a89791c..64698f23f4181dbd32c4d1551eec9da559d61467 100644 GIT binary patch delta 2723 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 delta 2673 zcmV-%3Xb*ZAh#f}j|G2=YPt5PJNR+L5g%iZ%{JexbI$f~+_B6ci>&CPI{7K9oGLfP^3vhbHf}vJay2m0`Oy8LP|v>!AdWEu*-&#VF-WJRmZ*a);Mo%uiPLT zLPq|zB^%_ZZ%}Qk_S(OGNhY~)<6ZOIbK88k;vt94WRztOobqIX5B{y4XFi>{;u%xi zaOjRJE^*{gl6|e&*Orm!`1i;szpLzrIS+l+mq<_j`qkrpKFuL-kEZJG z0orD(b$J3cB8q0E!5{Z`~LDdM2enjIM&1S{8I1P?+1Y#YJ zc*i_SZj66@yv!f}7#=~cF)D>rQl$_%$3=dTU3h%Z9$|%$GG2v}XRPEPH`B%|ZcssGm#|CX}VE`*_`D8ho*m!W&#qLsw^iVZM8_#oQ%bXg~JpiY&hUp1+utSXknEli_Y<*3ML zm`iZ7M5vgVsaWeo)~miE5*4fC#5!rfV?;uJ>|~Tkor%Mut`et)Y?~q0WyeomA{w!D zti)E4#BO#KB!e}hZ=#|Ksq8RUU8<`D@0x#Ckd5xN5zB=DzmW@?Va>E4^ZqMfm)R${ zZuTji)!}DrN=+UiPM@YztpHmKxrnvvk>0e@YErqH{F#uq=L7(0vAI|3X+s;-+v^u) zJ4&LJa=GsOj&mOfU00sT;HQ zVg>7VheAebkttQ=9e1_FQ*APepUi(?tMoQaW4ec!#k?l7R;bKlCNut<*m~t2-_JKd zPF~7-%bqiF4@lk(=?I$~XV}dd&-zhMdH|j0C2JYZDb}B5=uGHF7y6s^J@l3x_}Ohu zh0%@%bUzj2iJn1UWK zQHy7gV;&@cLLMwZi)MsF9_y~R&Ueo9o!{F7Ca3}*G;s@OoP!4*xViyPK zzz&*VhCBFS5(!|z5ypTAL~z0t41mEB%CLt=bV3#bXn+M)po1Vp0ShS<;6WDb;0RFQ zA{j0SgCIsh3~snXA31;bCD1YW!nfNO=sA9}yMWh1W4MO-hlc+bfO04uW!Q%9f98MS=Y-N1heFtbTgZj}@O!~G zeE!9Ee95ODKaPSTPrvm8k z4cXUolQ@K0c!g9*5r(LViP(vZ2#VtIh>Pb7gNK0WlZFd;hnkUx7&t5#sD@lJg;_XA zkmw-pe};;Yhz`hjBu2P`Yt)Qy_}HPfMvl{=%A142!O%(A$j6{=cjn}hLGSlk9b&*;TVCv z*o*QwknN}$;uwuk2vrsN8W#y~!tidT0Fv(Ze~}AGksApZ9f^_d#*ine6&(qU<_G?h zz*tHxX^|O7k|=1BHMtcj$#~g-fGoL_qiBBqhz@^1Z$-(CIw_POp^{2TlT6taJ!y*H zN0sZilu_A}P8pOt*^|!5Zu(enVJU)8Sx!hXl+gE;@Rp6}z?SZ&mI6tWl~|2dIEc%r ze}WzWS<&DDi_n)I@E{(*0fOlPMo^d@us$BJI~ak14q)&RBuz01rB&6=> zrSkThYJlHZsDSFImU^i&5fA`7OJp0* diff --git a/main.c b/main.c index 15b0528..a678c13 100755 --- a/main.c +++ b/main.c @@ -1120,13 +1120,13 @@ void SFG_getPlayerWeaponInfo( void SFG_playerRotateWeapon(uint8_t next) { - RCL_Unit initialWeapon = SFG_player.weapon; - RCL_Unit increment = next ? 1 : -1; + uint8_t initialWeapon = SFG_player.weapon; + int8_t increment = next ? 1 : -1; while (1) { - SFG_player.weapon = - RCL_wrap(SFG_player.weapon + increment,SFG_WEAPONS_TOTAL); + SFG_player.weapon = + (SFG_WEAPONS_TOTAL + SFG_player.weapon + increment) % SFG_WEAPONS_TOTAL; if (SFG_player.weapon == initialWeapon) break;