From 5f6014223dd5fc30aaeeb3f7394e910c5ab0293a Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sun, 9 Jan 2022 10:38:05 +0100
Subject: [PATCH] Don't convert global colormaps

---
 src/p_setup.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index 51ea552a8..247741f0f 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2035,15 +2035,25 @@ static void P_WriteTextmap(void)
 	{
 		INT32 s;
 
-		if (wlines[i].special != 606)
-			continue;
-
-		TAG_ITER_SECTORS(wlines[i].args[0], s)
+		switch (wlines[i].special)
 		{
-			if (wsectors[s].colormap_protected)
-				continue;
+			case 606:
+				if (wlines[i].args[0] == MTAG_GLOBAL)
+				{
+					CONS_Printf("Linedef %d applies a global colormap which cannot be converted automatically. Please convert it manually.\n", i);
+					break;
+				}
 
-			wsectors[s].extra_colormap = wsides[wlines[i].sidenum[0]].colormap_data;
+				TAG_ITER_SECTORS(wlines[i].args[0], s)
+				{
+					if (wsectors[s].colormap_protected)
+						continue;
+
+					wsectors[s].extra_colormap = wsides[wlines[i].sidenum[0]].colormap_data;
+				}
+				break;
+			default:
+				break;
 		}
 	}