mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'infinitepainfloor' into 'master'
Fix infinite pain floors See merge request KartKrew/Kart!515
This commit is contained in:
commit
8f22730dc5
1 changed files with 1 additions and 3 deletions
|
|
@ -1845,10 +1845,8 @@ 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 && inflictor == NULL)
|
||||||
if (!(damagetype & DMG_DEATHMASK) && target->hitlag > 0)
|
|
||||||
return false;
|
return false;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (target->flags2 & MF2_SKULLFLY)
|
if (target->flags2 & MF2_SKULLFLY)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue