From 25dd4b7b4477338fe30544e45cf3e0a76aa268c6 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Tue, 9 Apr 2019 13:13:53 -0400 Subject: [PATCH] Bring back Eggman detonation --- src/k_kart.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 0cbade16e..1b6f79059 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5759,7 +5759,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground) || player->kartstuff[k_itemamount] || player->kartstuff[k_itemroulette] || player->kartstuff[k_growshrinktimer] // Being disabled during Shrink was unintended but people seemed to be okay with it sooo... - || player->kartstuff[k_rocketsneakertimer])) + || player->kartstuff[k_rocketsneakertimer] + || player->kartstuff[k_eggmanexplode])) player->kartstuff[k_userings] = 1; else player->kartstuff[k_userings] = 0; @@ -5825,8 +5826,14 @@ void K_MoveKartPlayer(player_t *player, boolean onground) // Other items else { + // Eggman Monitor exploding + if (player->kartstuff[k_eggmanexplode]) + { + if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanexplode] <= 3*TICRATE && player->kartstuff[k_eggmanexplode] > 1) + player->kartstuff[k_eggmanexplode] = 1; + } // Eggman Monitor throwing - if (player->kartstuff[k_eggmanheld]) + else if (player->kartstuff[k_eggmanheld]) { if (ATTACK_IS_DOWN) {