stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Eggman shrink bug.

Browse source 
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
This commit is contained in:
toaster 2018-11-17 14:41:08 +00:00
parent e85e621d2c
commit 8735dcd24b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_kart.c
View file

@ -4709,7 +4709,10 @@ void K_StripOther(player_t *player)
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
player->kartstuff[k_invincibilitytimer] = 0; player->kartstuff[k_invincibilitytimer] = 0;
player->kartstuff[k_growshrinktimer] = 0; if (player->kartstuff[k_growshrinktimer] > 0)
player->kartstuff[k_growshrinktimer] = 2;
else if (player->kartstuff[k_growshrinktimer] < 0)
player->kartstuff[k_growshrinktimer] = -2;
if (player->kartstuff[k_eggmanexplode]) if (player->kartstuff[k_eggmanexplode])
{ {

4
src/p_inter.c
View file

@ -406,7 +406,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
else else
{ {
K_DropItems(player); //K_StripItems(player); K_DropItems(player); //K_StripItems(player);
K_StripOther(player); //K_StripOther(player);
player->kartstuff[k_itemroulette] = 1; player->kartstuff[k_itemroulette] = 1;
player->kartstuff[k_roulettetype] = 2; player->kartstuff[k_roulettetype] = 2;
} }
@ -544,7 +544,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
special->target->player->kartstuff[k_comebacktimer] = comebacktime; special->target->player->kartstuff[k_comebacktimer] = comebacktime;
K_DropItems(player); //K_StripItems(player); K_DropItems(player); //K_StripItems(player);
K_StripOther(player); //K_StripOther(player);
player->kartstuff[k_itemroulette] = 1; player->kartstuff[k_itemroulette] = 1;
player->kartstuff[k_roulettetype] = 2; player->kartstuff[k_roulettetype] = 2;