mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Fix A-stings-B-stings-C billiards (FOREITHER IS FORXOR _WHY_)
This commit is contained in:
parent
67109e2da1
commit
763f9b2124
1 changed files with 6 additions and 0 deletions
|
|
@ -1347,6 +1347,9 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
|
|||
t1->eflags &= ~MFE_DAMAGEHITLAG;
|
||||
};
|
||||
|
||||
// Looks bad, but "forEither" actually runs if t1 XOR t2 were damaged.
|
||||
// I don't even think we use the touchdamage return value but I'm too
|
||||
// afraid to change it now. Fix this if you're the next guy and annoyed
|
||||
if (forEither(doSting, removeDamageHitlag))
|
||||
{
|
||||
t1->player->pflags2 &= ~PF2_SAMEFRAMESTUNG;
|
||||
|
|
@ -1354,6 +1357,9 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
|
|||
return true;
|
||||
}
|
||||
|
||||
t1->player->pflags2 &= ~PF2_SAMEFRAMESTUNG;
|
||||
t2->player->pflags2 &= ~PF2_SAMEFRAMESTUNG;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue