From 90eb7c71a348351631d56ccb80fdc8934dac20f9 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Tue, 28 Dec 2021 07:29:41 +0100
Subject: [PATCH] Adapt skybox view point to UDMF

---
 extras/conf/udb/Includes/SRB222_things.cfg | 10 ++++++++++
 src/p_mobj.c                               |  2 +-
 src/p_setup.c                              |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 41a99d1d7..f1ed572c1 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -5142,6 +5142,16 @@ udmf
 		{
 			title = "Skybox View Point";
 			sprite = "internal:skyb";
+			arg0
+			{
+				title = "Type";
+				type = 11;
+				enum
+				{
+					0 = "Viewpoint";
+					1 = "Centerpoint";
+				}
+			}
 		}
 	}
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 018d853f6..250935cc5 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -12705,7 +12705,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
 			break;
 		}
 
-		if (mthing->options & MTF_OBJECTSPECIAL)
+		if (mthing->args[0])
 			skyboxcenterpnts[tag] = mobj;
 		else
 			skyboxviewpnts[tag] = mobj;
diff --git a/src/p_setup.c b/src/p_setup.c
index 783446298..1027b92e2 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -5079,6 +5079,9 @@ static void P_ConvertBinaryMap(void)
 			mapthings[i].type = 761;
 			break;
 		}
+		case 780: //Skybox
+			mapthings[i].args[0] = !!(mapthings[i].options & MTF_OBJECTSPECIAL);
+			break;
 		case 1104: //Mace spawnpoint
 		case 1105: //Chain with maces spawnpoint
 		case 1106: //Chained spring spawnpoint