From c28bd8005eea0cf8ab83326ddb1b0d35deca0e9d Mon Sep 17 00:00:00 2001 From: Zippy_Zolton Date: Thu, 3 Dec 2020 01:28:54 -0600 Subject: [PATCH] Fix fire objects disappearing in lava --- src/p_mobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.c b/src/p_mobj.c index 7ba6d1fad..d06e57d66 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -7937,7 +7937,7 @@ static boolean P_MobjPushableThink(mobj_t *mobj) P_PushableThinker(mobj); // Extinguish fire objects in water. (Yes, it's extraordinarily rare to have a pushable flame object, but Brak uses such a case.) - if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL + if (mobj->flags & MF_FIRE && mobj->eflags ! MFE_TOUCHLAVA && (mobj->eflags & (MFE_UNDERWATER | MFE_TOUCHWATER))) { P_KillMobj(mobj, NULL, NULL, 0); @@ -9705,7 +9705,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) P_MobjCheckWater(mobj); // Extinguish fire objects in water - if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL + if (mobj->flags & MF_FIRE && mobj->eflags ! MFE_TOUCHLAVA && (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))) { P_KillMobj(mobj, NULL, NULL, 0);