From f0fd9f7656be11fec6fe0598de0032eaba1be398 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Thu, 1 Aug 2019 11:35:04 +0100
Subject: [PATCH] Ok, now the MobjThinker Lua hook is neutralised properly as
well.
---
src/p_mobj.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index fe0044634a..fe45a799a7 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7011,6 +7011,9 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->flags & MF_NOTHINK)
return;
+ if ((mobj->flags & MF_BOSS) && mobj->spawnpoint && !(mobj->spawnpoint->extrainfo & ~15) && (bossdisabled & (1<<mobj->spawnpoint->extrainfo)))
+ return;
+
// Remove dead target/tracer.
if (mobj->target && P_MobjWasRemoved(mobj->target))
P_SetTarget(&mobj->target, NULL);
@@ -7674,9 +7677,6 @@ void P_MobjThinker(mobj_t *mobj)
}
else if (mobj->flags & MF_BOSS)
{
- if (mobj->spawnpoint && (mobj->spawnpoint->extrainfo < 16) && (bossdisabled & (1<<mobj->spawnpoint->extrainfo)))
- return;
-
#ifdef HAVE_BLUA
if (LUAh_BossThinker(mobj))
{
--
GitLab