fixed UMAPINFO's label field to allow 'clear' as argument.

ZDoom · Oct 21, 2024 · 4dc9a9f · 4dc9a9f
1 parent 34dc204
commit 4dc9a9f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/gamedata/umapinfo.cpp b/src/gamedata/umapinfo.cpp
@@ -148,8 +148,22 @@ static int ParseStandardProperty(FScanner &scanner, UMapEntry *mape, int *id24_l
 	}
 	else if (!pname.CompareNoCase("label"))
 	{
-		scanner.MustGetToken(TK_StringConst);
-		mape->label = scanner.String;
+		if (scanner.CheckToken(TK_Identifier))
+		{
+			if (!stricmp(scanner.String, "clear"))
+			{
+				mape->label = "*";
+			}
+			else
+			{
+				scanner.ScriptError("Either 'clear' or string constant expected");
+			}
+		}
+		else
+		{
+			scanner.MustGetToken(TK_StringConst);
+			mape->label = scanner.String;
+		}
 	}
 	else if (!pname.CompareNoCase("next"))
 	{

diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp
@@ -2266,7 +2266,8 @@ void FormatMapName(FLevelLocals *self, int cr, FString *result)
 	// If a label is specified, use it uncontitionally here.
 	if (self->info->MapLabel.IsNotEmpty())
 	{
-		*result << self->info->MapLabel << ": ";
+		if (self->info->MapLabel.Compare("*"))
+			*result << self->info->MapLabel << ": ";
 	}
 	else if (am_showmaplabel == 1 || (am_showmaplabel == 2 && !ishub))
 	{