From 2c080cbd144fa7d2e0e14abd8de8043eced3e02d Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 7 Mar 2019 21:32:16 -0500 Subject: [PATCH] Wrong order here --- src/k_kart.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 62a5937d3..86f2807d7 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5488,6 +5488,18 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->kartstuff[k_rocketsneakertimer] = 1; } } + // Grow Canceling + else if (player->kartstuff[k_growshrinktimer] > 0) + { + if (cmd->buttons & BT_ATTACK) + { + player->kartstuff[k_growcancel]++; + if (player->kartstuff[k_growcancel] > 26) + K_RemoveGrowShrink(player); + } + else + player->kartstuff[k_growcancel] = 0; + } else if (player->kartstuff[k_itemtype] == KITEM_NONE) { if ((player->pflags & PF_ATTACKDOWN) && !HOLDING_ITEM && NO_HYUDORO @@ -5502,18 +5514,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->kartstuff[k_ringdelay] = 3; } } - // Grow Canceling - else if (player->kartstuff[k_growshrinktimer] > 0) - { - if (cmd->buttons & BT_ATTACK) - { - player->kartstuff[k_growcancel]++; - if (player->kartstuff[k_growcancel] > 26) - K_RemoveGrowShrink(player); - } - else - player->kartstuff[k_growcancel] = 0; - } else if (player->kartstuff[k_itemamount] <= 0) { player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;