incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bubblepop not being reset in some cases

Browse source
This commit is contained in:
NepDisk 2025-02-26 20:59:57 -05:00
parent 5d5701790d
commit fe97d7263b
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_collide.c
View file

@ -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;
}
}

3
src/k_kart.c
View file

@ -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)