From d63c1d8ab4afdb92f51ecd43f2b27832442a92d5 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Thu, 15 Jun 2023 12:44:19 -0400
Subject: [PATCH] Reorder stuff in P_SpawnMobjFromMapThing

Fixes the loops issue Tyron ran into. Way, way too much stuff was being initialized after P_SetupSpawnedMapThing instead of before.

Also get rid of weird doangle pointer crap, I don't understand why it did it that way to begin with? The only thing that I didn't write that needed to set it was P_SetupMace, which just seemed to be a weird hack to get around the weird ordering, instead of just changing the ordering? A lot of objects even double-calculate the angle just because it hasn't been set yet...
---
 src/p_mobj.c | 67 ++++++++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 39 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index f0e529a0d..d2fd861cf 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12305,7 +12305,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
 	return true;
 }
 
-static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
+static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj)
 {
 	fixed_t mlength, mmaxlength, mlengthset, mspeed, mphase, myaw, mpitch, mminlength, mnumspokes, mpinch, mroll, mnumnospokes, mwidth, mwidthset, mmin, msound, radiusfactor, widthfactor;
 	angle_t mspokeangle;
@@ -12350,7 +12350,6 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
 	mobj->lastlook = mspeed;
 	mobj->movecount = mobj->lastlook;
 	mobj->angle = FixedAngle(myaw << FRACBITS);
-	*doangle = false;
 	mobj->threshold = (FixedAngle(mpitch << FRACBITS) >> ANGLETOFINESHIFT);
 	mobj->movefactor = mpinch;
 	mobj->movedir = 0;
@@ -12745,7 +12744,7 @@ static boolean P_MapAlreadyHasStarPost(mobj_t *mobj)
 	return false;
 }
 
-static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
+static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj)
 {
 	boolean override = LUA_HookMapThingSpawn(mobj, mthing);
 
@@ -12857,7 +12856,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 	case MT_CHAINPOINT:
 	case MT_FIREBARPOINT:
 	case MT_CUSTOMMACEPOINT:
-		if (!P_SetupMace(mthing, mobj, doangle))
+		if (!P_SetupMace(mthing, mobj))
 			return false;
 		break;
 	case MT_PARTICLEGEN:
@@ -13350,23 +13349,18 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 	}
 	case MT_DUELBOMB:
 	{
-		// Duel Bomb needs init to match real map thing's angle
-		mobj->angle = FixedAngle(mthing->angle << FRACBITS);
 		Obj_DuelBombInit(mobj);
 
 		if (mthing->args[1])
 		{
 			Obj_DuelBombReverse(mobj);
 		}
-
-		*doangle = false;
 		break;
 	}
 	case MT_BANANA:
 	{
 		// Give Duel bananas a random angle
 		mobj->angle = FixedMul(P_RandomFixed(PR_DECORATION), ANGLE_MAX);
-		*doangle = false;
 		break;
 	}
 	case MT_HYUDORO_CENTER:
@@ -13398,37 +13392,9 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 			mobj->flags2 |= MF2_BOSSNOTRAP;
 	}
 
-	return true;
-}
-
-static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, fixed_t z, mobjtype_t i)
-{
-	mobj_t *mobj = NULL;
-	boolean doangle = true;
-	size_t arg = SIZE_MAX;
-
-	mobj = P_SpawnMobj(x, y, z, i);
-	mobj->spawnpoint = mthing;
-
-	P_SetScale(mobj, FixedMul(mobj->scale, mthing->scale));
-	mobj->destscale = FixedMul(mobj->destscale, mthing->scale);
-
-	if (!P_SetupSpawnedMapThing(mthing, mobj, &doangle))
-	{
-		if (P_MobjWasRemoved(mobj))
-			return NULL;
-
-		return mobj;
-	}
-
-	if (doangle)
-	{
-		mobj->angle = FixedAngle(mthing->angle << FRACBITS);
-	}
-
 	if ((mobj->flags & MF_SPRING)
-	&& mobj->info->damage != 0
-	&& mobj->info->mass == 0)
+		&& mobj->info->damage != 0
+		&& mobj->info->mass == 0)
 	{
 		// Offset sprite of horizontal springs
 		angle_t a = mobj->angle + ANGLE_180;
@@ -13436,9 +13402,24 @@ static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y,
 		mobj->spryoff = FixedMul(mobj->radius, FINESINE(a >> ANGLETOFINESHIFT));
 	}
 
+	return true;
+}
+
+static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, fixed_t z, mobjtype_t i)
+{
+	mobj_t *mobj = NULL;
+	size_t arg = SIZE_MAX;
+
+	mobj = P_SpawnMobj(x, y, z, i);
+	mobj->spawnpoint = mthing;
+
+	mobj->angle = FixedAngle(mthing->angle << FRACBITS);
 	mobj->pitch = FixedAngle(mthing->pitch << FRACBITS);
 	mobj->roll = FixedAngle(mthing->roll << FRACBITS);
 
+	P_SetScale(mobj, FixedMul(mobj->scale, mthing->scale));
+	mobj->destscale = FixedMul(mobj->destscale, mthing->scale);
+
 	P_SetThingTID(mobj, mthing->tid);
 
 	mobj->special = mthing->special;
@@ -13468,6 +13449,14 @@ static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y,
 		M_Memcpy(mobj->stringargs[arg], mthing->stringargs[arg], len + 1);
 	}
 
+	if (!P_SetupSpawnedMapThing(mthing, mobj))
+	{
+		if (P_MobjWasRemoved(mobj))
+			return NULL;
+
+		return mobj;
+	}
+
 	mthing->mobj = mobj;
 
 	// Generic reverse gravity for individual objects flag.