Fix fire objects disappearing in lava
This commit is contained in:
parent
d004515d6a
commit
c28bd8005e
|
@ -7937,7 +7937,7 @@ static boolean P_MobjPushableThink(mobj_t *mobj)
|
||||||
P_PushableThinker(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.)
|
// 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)))
|
&& (mobj->eflags & (MFE_UNDERWATER | MFE_TOUCHWATER)))
|
||||||
{
|
{
|
||||||
P_KillMobj(mobj, NULL, NULL, 0);
|
P_KillMobj(mobj, NULL, NULL, 0);
|
||||||
|
@ -9705,7 +9705,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
||||||
P_MobjCheckWater(mobj);
|
P_MobjCheckWater(mobj);
|
||||||
|
|
||||||
// Extinguish fire objects in water
|
// 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)))
|
&& (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
|
||||||
{
|
{
|
||||||
P_KillMobj(mobj, NULL, NULL, 0);
|
P_KillMobj(mobj, NULL, NULL, 0);
|
||||||
|
|
Loading…
Reference in New Issue