diff --git a/src/p_inter.c b/src/p_inter.c index ea87643a3..526c1bc1a 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -2278,8 +2278,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da UINT8 shouldForce = LUAh_ShouldDamage(target, inflictor, source, damage); if (P_MobjWasRemoved(target)) return (shouldForce == 1); // mobj was removed - if (P_MobjWasRemoved(source)) - source = NULL; if (shouldForce == 1) force = true; else if (shouldForce == 2) @@ -2506,6 +2504,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da P_ResetPlayer(target->player); } else + { switch (target->type) { case MT_EGGMOBILE2: // egg slimer @@ -2519,9 +2518,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da P_SetMobjState(target, target->info->painstate); break; } - - if (P_MobjWasRemoved(target)) - return false; + } if (!P_MobjWasRemoved(target)) {