From 7237b6bea961afff0d3289e1c226bac2c0defa1b Mon Sep 17 00:00:00 2001 From: toaster Date: Tue, 4 Jan 2022 23:35:59 +0000 Subject: [PATCH] Fix infinite pain floors If inflictor is null and you're in hitlag do not damage again --- src/p_inter.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/p_inter.c b/src/p_inter.c index 6a352ecec..59ea152ab 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -1844,10 +1844,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)