From fe97d7263bced3829cca66b7a2e3875ef4da38a5 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Wed, 26 Feb 2025 20:59:57 -0500 Subject: [PATCH] Fix bubblepop not being reset in some cases --- src/k_collide.c | 2 -- src/k_kart.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/k_collide.c b/src/k_collide.c index 33a591e02..079a5bad7 100644 --- a/src/k_collide.c +++ b/src/k_collide.c @@ -745,7 +745,6 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) if (player->bubblepop > 1) { K_DropHnextList(player, false); - player->bubblepop = 0; } } @@ -778,7 +777,6 @@ boolean K_BubbleShieldCollide(mobj_t *t1, mobj_t *t2) if (player->bubblepop > 1) { K_DropHnextList(player, false); - player->bubblepop = 0; } } diff --git a/src/k_kart.c b/src/k_kart.c index 4bbd19786..8e71359b9 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7050,7 +7050,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) // Start at lap 1 when using old checkpoint system just to be safe. if ((numbosswaypoints > 0) && (player->laps == 0) && (numlaps > 0)) player->laps = 1; - + if (player->stealingtimer == 0 && player->stolentimer == 0 && player->rocketsneakertimer) player->rocketsneakertimer--; @@ -7138,6 +7138,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) { player->bubbleblowup = 0; player->bubblecool = 0; + player->bubblepop = 0; } if (player->itemtype != KITEM_FLAMESHIELD)