From c64a9d7ae9d0d3756c348397c00b5e8460c504a0 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Thu, 12 Dec 2019 11:37:48 +0100
Subject: [PATCH] Stop things from becoming Chocapic in THZ3, ACZ2, and special
 stages.

Temporarily revert function call order for mapthings.
---
 src/p_setup.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 0430ab997..cc53f2d3d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1963,6 +1963,7 @@ static void LoadMapLUT (const virtres_t* virt)
 static void LoadMapData (const virtres_t* virt)
 {
 	virtlump_t* virtvertexes = NULL, * virtsectors = NULL, * virtsidedefs = NULL, * virtlinedefs = NULL, * virtthings = NULL;
+#ifdef UDMF
 	virtlump_t* textmap = vres_Find(virt, "TEXTMAP");
 
 	// Count map data.
@@ -1978,6 +1979,7 @@ static void LoadMapData (const virtres_t* virt)
 		//TextmapCount(vtextmap->data, vtextmap->size);
 	}
 	else
+#endif
 	{
 		virtthings   = vres_Find(virt, "THINGS");
 		virtvertexes = vres_Find(virt, "VERTEXES");
@@ -2008,11 +2010,13 @@ static void LoadMapData (const virtres_t* virt)
 	lines    = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
 	mapthings= Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
 
+#ifdef UDMF
 	if (textmap)
 	{
 
 	}
 	else
+#endif
 	{
 		// Strict map data
 		P_LoadRawVertexes(virtvertexes->data);
@@ -2020,7 +2024,6 @@ static void LoadMapData (const virtres_t* virt)
 		P_LoadRawLineDefs(virtlinedefs->data);
 		SetupLines();
 		P_LoadRawSideDefs2(virtsidedefs->data);
-		P_PrepareRawThings(virtthings->data);
 	}
 }
 
@@ -2788,6 +2791,8 @@ boolean P_SetupLevel(boolean skipprecip)
 		P_LoadLineDefs2();
 		P_GroupLines();
 
+		P_PrepareRawThings(vres_Find(virt, "THINGS")->data);
+
 		P_MakeMapMD5(virt, &mapmd5);
 
 		vres_Free(virt);