From d2cbdd4fb1ebaf0a2ef2c093197e0a4c6f59a35f Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Wed, 11 Dec 2019 10:57:24 +0100
Subject: [PATCH] Do not overwrite the mapthing Z when spawning rings and
 similars, as it now causes them to respawn in wrong places because it is
 being actually used now.

---
 src/p_mobj.c  | 3 ---
 src/p_setup.c | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 34d33f788..3d26b28f3 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -11554,7 +11554,6 @@ INT32 numhuntemeralds;
 static fixed_t GetMobjSpawnHeight (const mobjtype_t i, const mapthing_t* mthing, const fixed_t x, const fixed_t y)
 {
 	subsector_t *ss = R_PointInSubsector(x, y);
-	fixed_t z;
 	fixed_t extraoffset = 0;
 	fixed_t heightoffset = 0;
 	boolean flip;
@@ -13603,8 +13602,6 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
 				z += 24*FRACUNIT;
 		}
 
-		mthing->z = (INT16)(z>>FRACBITS);
-
 		mobj = P_SpawnMobj(x, y, z, ringthing);
 		mobj->spawnpoint = mthing;
 
diff --git a/src/p_setup.c b/src/p_setup.c
index d40c728ab..628292fe0 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -906,10 +906,6 @@ void P_ReloadRings(void)
 		{
 			mt->mobj = NULL;
 
-			// Z for objects Tails 05-26-2002
-			mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
-				->sector->floorheight>>FRACBITS);
-
 			P_SpawnHoopsAndRings(mt, true);
 		}
 	}