From dad1d7b610381e6ab7fa8798ac44121ee0b17eea Mon Sep 17 00:00:00 2001 From: Sally Cochenour Date: Tue, 17 Mar 2020 20:37:36 -0400 Subject: [PATCH] Apply to flame shield as well (although it didn't need it) --- src/k_kart.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 980104301..0574a15ce 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6776,20 +6776,19 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (!HOLDING_ITEM && NO_HYUDORO) { - if (cmd->buttons & BT_ATTACK) + if ((cmd->buttons & BT_ATTACK) && player->kartstuff[k_holdready]) { - if (player->kartstuff[k_holdready]) + if (player->kartstuff[k_flamedash] == 0) + K_PlayBoostTaunt(player->mo); + + player->kartstuff[k_flamedash]++; + + if (player->kartstuff[k_flamedash] > 10*TICRATE) { - if (player->kartstuff[k_flamedash] == 0) - K_PlayBoostTaunt(player->mo); - player->kartstuff[k_flamedash]++; - if (player->kartstuff[k_flamedash] > 10*TICRATE) - { - K_FlameShieldPop(player->mo); - player->kartstuff[k_flamedash] = 0; - player->kartstuff[k_holdready] = 0; - player->kartstuff[k_itemamount]--; - } + K_FlameShieldPop(player->mo); + player->kartstuff[k_flamedash] = 0; + player->kartstuff[k_holdready] = 0; + player->kartstuff[k_itemamount]--; } } else