thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-11 10:32:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't use damage hitlag effects on a person when they "win" a ring sting exchange

Browse source 
Only applies to ring sting collision (no other types of damage touching), only applies to the person not getting stung. The person who is getting stung & sting trades are unaffected.
This commit is contained in:
Sally Coolatta 2022-01-04 00:39:01 -05:00 • committed by SinnamonLat
parent 97a503d2c2
commit 4ff50fe438
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_collide.c
View file

@ -483,7 +483,8 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
{ {
boolean t1Condition = false; boolean t1Condition = false;
boolean t2Condition = false; boolean t2Condition = false;
boolean stung = false; boolean stungT1 = false;
boolean stungT2 = false;
// Grow damage // Grow damage
t1Condition = (t1->scale > t2->scale + (mapobjectscale/8)); t1Condition = (t1->scale > t2->scale + (mapobjectscale/8));
@ -558,7 +559,7 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
if (t2->player->rings <= 0) if (t2->player->rings <= 0)
{ {
P_DamageMobj(t2, t1, t1, 1, DMG_STING); P_DamageMobj(t2, t1, t1, 1, DMG_STING);
stung = true; stungT2 = true;
} }
P_PlayerRingBurst(t2->player, 1); P_PlayerRingBurst(t2->player, 1);
@ -569,11 +570,21 @@ boolean K_PvPTouchDamage(mobj_t *t1, mobj_t *t2)
if (t1->player->rings <= 0) if (t1->player->rings <= 0)
{ {
P_DamageMobj(t1, t2, t2, 1, DMG_STING); P_DamageMobj(t1, t2, t2, 1, DMG_STING);
stung = true; stungT1 = true;
} }
P_PlayerRingBurst(t1->player, 1); P_PlayerRingBurst(t1->player, 1);
} }
return stung; // No damage hitlag for stinging.
if (stungT1 == true && stungT2 == false)
{
t2->eflags &= ~MFE_DAMAGEHITLAG;
}
else if (stungT2 == true && stungT1 == false)
{
t1->eflags &= ~MFE_DAMAGEHITLAG;
}
return (stungT1 || stungT2);
} }