From 7407c9a8dcb9092d9b0af59e17de30f1e5d962f5 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 22 Oct 2018 17:05:44 -0400 Subject: [PATCH] Don't destroy all of your balloons in 3 tics --- src/k_kart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 8aeb4281..9ddb1031 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1979,7 +1979,8 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b player->kartstuff[k_sneakertimer] = 0; player->kartstuff[k_driftboost] = 0; - if (G_BattleGametype()) + // This is the only part that SHOULDN'T combo :VVVVV + if (G_BattleGametype() && !(player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || player->kartstuff[k_spinouttimer] > 0)) { if (source && source->player && player != source->player) {