vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'shrinkegg_fix' into 'master' 

Fix Eggman shrink bug

Closes #38

See merge request KartKrew/Kart!89
This commit is contained in:
Sal 2018-11-17 16:24:40 -05:00
parent bc33cb78a6 8735dcd24b
commit e4cb1bc430
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_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])
{

4
src/p_inter.c
View File

@ -406,7 +406,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
else
{
K_DropItems(player); //K_StripItems(player);
K_StripOther(player);
//K_StripOther(player);
player->kartstuff[k_itemroulette] = 1;
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;
K_DropItems(player); //K_StripItems(player);
K_StripOther(player);
//K_StripOther(player);
player->kartstuff[k_itemroulette] = 1;
player->kartstuff[k_roulettetype] = 2;