From 8735dcd24b458fb95fb629c19459373b5f6949f3 Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 17 Nov 2018 14:41:08 +0000 Subject: [PATCH] Fix Eggman shrink bug. 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. --- src/k_kart.c | 5 ++++- src/p_inter.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 5d7b13f8..f35349cd 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -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]) { diff --git a/src/p_inter.c b/src/p_inter.c index 743ea321..fed68f85 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -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;