From 42d79efa2735658c8cf66d0af4857aa410a073ea Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 15 Jan 2024 21:39:37 -0800 Subject: [PATCH] Insta-Whip charging: do not drain spheres while player is in damage state --- src/k_kart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 286eac51a..a0a9a4335 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -8475,7 +8475,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (K_PlayerGuard(player) && !K_PowerUpRemaining(player, POWERUP_BARRIER) && (player->ebrakefor%6 == 0)) player->spheres--; - if (player->instaWhipCharge && !K_PowerUpRemaining(players, POWERUP_BADGE) && leveltime%6 == 0) + if (player->instaWhipCharge && !K_PowerUpRemaining(players, POWERUP_BADGE) && leveltime%6 == 0 && !P_PlayerInPain(player)) player->spheres--; } else