From 03a47cfb5ae1095dc64e84d542318aaf55b5cf02 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 11 Feb 2022 01:13:38 +0000 Subject: [PATCH] Prevent using a grow while invincible resetting the invincible music timer, when that SHOULDN'T be touched and will be set to grow properly once that's over. --- src/k_kart.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index e2b4aa6c2..1f961b15b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -9222,7 +9222,11 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->growshrinktimer = itemtime+(4*TICRATE); // 12 seconds - if (P_IsLocalPlayer(player) == true) + if (player->invincibilitytimer > 0) + { + ; // invincibility has priority in P_RestoreMusic, no point in starting here + } + else if (P_IsLocalPlayer(player) == true) { S_ChangeMusicSpecial("kgrow"); }