From d4b3fe36c82e4b81de7c19ec13b396f31aadcf3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustaf=20Alh=C3=A4ll?= <gustaf@hanicef.me>
Date: Tue, 29 Aug 2023 20:56:24 +0200
Subject: [PATCH] Fix faulty references when spawning mobjs
---
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 de2c3a72c7..15babf8725 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10749,6 +10749,9 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Set shadowscale here, before spawn hook so that Lua can change it
mobj->shadowscale = P_DefaultMobjShadowScale(mobj);
+ if (!(mobj->flags & MF_NOTHINK))
+ P_AddThinker(THINK_MOBJ, &mobj->thinker);
+
// DANGER! This can cause P_SpawnMobj to return NULL!
// Avoid using P_RemoveMobj on the newly created mobj in "MobjSpawn" Lua hooks!
if (LUA_HookMobj(mobj, MOBJ_HOOK(MobjSpawn)))
@@ -11004,9 +11007,6 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
}
}
- if (!(mobj->flags & MF_NOTHINK))
- P_AddThinker(THINK_MOBJ, &mobj->thinker);
-
if (mobj->skin) // correct inadequecies above.
{
mobj->sprite2 = P_GetSkinSprite2(mobj->skin, (mobj->frame & FF_FRAMEMASK), NULL);
--
GitLab