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 'infinitepainfloor' into 'master'

Browse source 
Fix infinite pain floors

See merge request KartKrew/Kart!515
This commit is contained in:
Sal 2022-01-05 03:45:14 +00:00
commit 8f22730dc5
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_inter.c
View file

@ -1845,10 +1845,8 @@ 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 0
if (!(damagetype & DMG_DEATHMASK) && target->hitlag > 0)
if (!(damagetype & DMG_DEATHMASK) && target->hitlag > 0 && inflictor == NULL)
return false;
#endif
}
if (target->flags2 & MF2_SKULLFLY)