thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed sneaker-induced bumper theft (for those who saw my comment in MKD, turns out a simple P_PlayerInPain saves you from the multi-steal threat I considered)

Browse source
This commit is contained in:
toaster 2022-03-13 17:00:43 +00:00
parent b9acad707e
commit c68e0d46c0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_collide.c
View file

@ -570,8 +570,12 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
// (Pogo Spring damage is handled in head-stomping code) // (Pogo Spring damage is handled in head-stomping code)
if (gametyperules & GTR_BUMPERS) if (gametyperules & GTR_BUMPERS)
{ {
t1Condition = (t1->player->sneakertimer > 0 && t1->player->flashing != 0); t1Condition = ((t1->player->sneakertimer > 0)
t2Condition = (t2->player->sneakertimer > 0 && t2->player->flashing != 0); && !P_PlayerInPain(t1->player)
&& (t1->player->flashing == 0));
t2Condition = ((t2->player->sneakertimer > 0)
&& !P_PlayerInPain(t2->player)
&& (t2->player->flashing == 0));
if (t1Condition == true && t2Condition == false) if (t1Condition == true && t2Condition == false)
{ {