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

Let objects receive damage while in hitlag

Browse source
This commit is contained in:
James R 2021-12-29 22:58:21 -08:00
parent 07f965d4eb
commit 5498f9d02d
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -1838,8 +1838,10 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (!(target->flags & MF_SHOOTABLE)) if (!(target->flags & MF_SHOOTABLE))
return false; // shouldn't happen... return false; // shouldn't happen...
#if 0
if (!(damagetype & DMG_DEATHMASK) && target->hitlag > 0) if (!(damagetype & DMG_DEATHMASK) && target->hitlag > 0)
return false; return false;
#endif
} }
if (target->flags2 & MF2_SKULLFLY) if (target->flags2 & MF2_SKULLFLY)
@ -1922,7 +1924,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
if (combo == false) if (combo == false)
{ {
if (player->flashing > 0) if (player->mo->hitlag == 0 && player->flashing > 0)
{ {
// Post-hit invincibility // Post-hit invincibility
K_DoInstashield(player); K_DoInstashield(player);