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

Merge branch 'popsquared' into 'master'

Browse source 
Prevent hitlag from eating death events (resolves #112)

Closes #112

See merge request KartKrew/Kart!406
This commit is contained in:
Sal 2021-04-01 20:02:24 -04:00
commit 94ec99a935
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -1863,7 +1863,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (!(target->flags & MF_SHOOTABLE))
return false; // shouldn't happen...
if (target->hitlag > 0)
if (!(damagetype & DMG_DEATHMASK) && target->hitlag > 0)
return false;
}
@ -1947,7 +1947,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (combo == false)
{
if (player->powers[pw_flashing] > 0 || player->kartstuff[k_squishedtimer] > 0 || (player->kartstuff[k_spinouttimer] > 0 && player->kartstuff[k_spinouttype] != 2))
if (player->powers[pw_flashing] > 0)
{
// Post-hit invincibility
K_DoInstashield(player);