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

Insta-Whip: respect flashing tics unless player is in damage state

Browse source 
- Matches new flashing tics behavior
This commit is contained in:
James R 2024-01-13 19:17:57 -08:00
parent 9af09ec507
commit ce1fe0028a
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_collide.cpp
View file

@ -822,8 +822,7 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
{
player_t *victimPlayer = victim->player;
//if (victim != attacker && !P_PlayerInPain(victimPlayer) && victimPlayer->flashing == 0)
if (victim != attacker && victim->hitlag == 0)
if (victim != attacker && (P_PlayerInPain(victimPlayer) ? victim->hitlag == 0 : victimPlayer->flashing == 0))
{
// If both players have a whip, hits are order-of-execution dependent and that sucks.
// Player expectation is a clash here.