From af288571bd82af7534d96397d7d5072d75f13d19 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 21 Apr 2023 17:37:26 +0100
Subject: [PATCH] P_SetupEmblem: Correct flags *before* Obj_AudienceInit

---
 src/p_mobj.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 49dc1e992..1d7869812 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12306,6 +12306,13 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
 			return false;
 		}
 
+		// Signal that you are to behave like a follower
+		mobj->flags2 |= MF2_STRONGBOX;
+		if (followers[followerpick].mode == FOLLOWERMODE_GROUND)
+		{
+			mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
+		}
+
 		// Set up data
 		Obj_AudienceInit(mobj, NULL, followerpick);
 		if (P_MobjWasRemoved(mobj))
@@ -12313,13 +12320,6 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
 			CONS_Alert(CONS_WARNING, "P_SetupEmblem: Follower \"%s\" causes emblem for map %d with tag %d to be removed immediately!\n", emblemlocations[j].stringVar2, gamemap, tagnum);
 			return false;
 		}
-
-		// Signal that you are to behave like a follower
-		mobj->flags2 |= MF2_STRONGBOX;
-		if (followers[followerpick].mode == FOLLOWERMODE_GROUND)
-		{
-			mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
-		}
 	}
 
 	return true;