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

Let Bubbleboost steal bumpers also

Browse source
This commit is contained in:
NepDisk 2026-03-20 19:05:09 -04:00
parent c84c7c3a0b
commit f66b2df41e
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_collide.c
View file

@ -1117,14 +1117,16 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
return true;
}
// Battle Mode Sneaker damage
// Battle Mode Sneaker and Bubble damage
// (Pogo Spring damage is handled in head-stomping code)
if (gametypes[gametype]->rules & GTR_BUMPERS)
{
t1Condition = ((t1->player->sneakertimer > 0)
t1Condition = (((t1->player->sneakertimer > 0)
|| (t1->player->bubbleboost > 0))
&& !P_PlayerInPain(t1->player)
&& (t1->player->flashing == 0));
t2Condition = ((t2->player->sneakertimer > 0)
t2Condition = (((t2->player->sneakertimer > 0)
|| (t2->player->bubbleboost > 0))
&& !P_PlayerInPain(t2->player)
&& (t2->player->flashing == 0));