From 4fc07473fdc885e79ae4e01e4d9f423945bf7e09 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Fri, 17 Apr 2020 10:05:50 +0200
Subject: [PATCH] Skybox spawning now uses the taglists.

---
 src/p_mobj.c  | 11 +++++++----
 src/p_setup.c |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index c004d3257..5203c092f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12584,17 +12584,20 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 		break;
 	}
 	case MT_SKYBOX:
-		if (mthing->tag < 0 || mthing->tag > 15)
+	{
+		mtag_t tag = Tag_FGet(&mthing->tags);
+		if (tag < 0 || tag > 15)
 		{
-			CONS_Debug(DBG_GAMELOGIC, "P_SetupSpawnedMapThing: Skybox ID %d of mapthing %s is not between 0 and 15!\n", mthing->tag, sizeu1((size_t)(mthing - mapthings)));
+			CONS_Debug(DBG_GAMELOGIC, "P_SetupSpawnedMapThing: Skybox ID %d of mapthing %s is not between 0 and 15!\n", tag, sizeu1((size_t)(mthing - mapthings)));
 			break;
 		}
 
 		if (mthing->options & MTF_OBJECTSPECIAL)
-			skyboxcenterpnts[mthing->tag] = mobj;
+			skyboxcenterpnts[tag] = mobj;
 		else
-			skyboxviewpnts[mthing->tag] = mobj;
+			skyboxviewpnts[tag] = mobj;
 		break;
+	}
 	case MT_EGGSTATUE:
 		if (mthing->options & MTF_EXTRA)
 		{
diff --git a/src/p_setup.c b/src/p_setup.c
index bf85e7146..931a7cd8f 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2844,7 +2844,7 @@ static void P_ConvertBinaryMap(void)
 			mapthings[i].tag = mapthings[i].angle;
 			break;
 		case 780:
-			mapthings[i].tag = mapthings[i].extrainfo;
+			Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo);
 			break;
 		default:
 			break;