From 3d724f302df688f26e6e4c0ce180a5fa23633721 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Mon, 30 Dec 2019 01:16:50 -0300
Subject: [PATCH] Fix saloon doors not letting players through when marked with
the Ambush flag
---
src/p_enemy.c | 2 +-
src/p_map.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 74a11fe673..08aeac3836 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -14248,7 +14248,7 @@ void A_SaloonDoorSpawn(mobj_t *actor)
fixed_t c = FINECOSINE(fa)*locvar2;
fixed_t s = FINESINE(fa)*locvar2;
mobj_t *door;
- mobjflag2_t ambush = (actor->flags & MF2_AMBUSH);
+ mobjflag2_t ambush = (actor->flags2 & MF2_AMBUSH);
#ifdef HAVE_BLUA
if (LUA_CallAction("A_SaloonDoorSpawn", actor))
diff --git a/src/p_map.c b/src/p_map.c
index 2d36f747cc..462694fe2c 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -995,7 +995,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->type == MT_SALOONDOOR && tmthing->player)
{
mobj_t *ref = (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)) ? tmthing->tracer : tmthing;
- if ((thing->flags & MF2_AMBUSH) || ref != tmthing)
+ if ((thing->flags2 & MF2_AMBUSH) || ref != tmthing)
{
fixed_t dm = min(FixedHypot(ref->momx, ref->momy), 16*FRACUNIT);
angle_t ang = R_PointToAngle2(0, 0, ref->momx, ref->momy) - thing->angle;
@@ -1008,7 +1008,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->type == MT_SALOONDOORCENTER && tmthing->player)
{
- if ((thing->flags & MF2_AMBUSH) || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
+ if ((thing->flags2 & MF2_AMBUSH) || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
return true;
}
--
GitLab