From 1f2abda23cc7d7813abe0c6459729591a045c987 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 27 Dec 2021 10:33:29 +0100
Subject: [PATCH] - fixed map ccmd.

Something got lost when implementing user maps.
---
 source/core/cheats.cpp | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/source/core/cheats.cpp b/source/core/cheats.cpp
index b1db30714..84f68ae1a 100644
--- a/source/core/cheats.cpp
+++ b/source/core/cheats.cpp
@@ -414,28 +414,6 @@ CCMD(changemap)
 //
 //---------------------------------------------------------------------------
 
-void DoStartMap(FString mapname)
-{
-	FString mapfilename = mapname;
-	DefaultExtension(mapfilename, ".map");
-
-	// Check if the map is already defined.
-	auto map = FindMapByName(mapname);
-	if (map == nullptr)
-	{
-		map = SetupUserMap(mapfilename, g_gameType & GAMEFLAG_DUKE ? "dethtoll.mid" : nullptr);
-	}
-	if (map)
-	{
-		if (fileSystem.FindFile(map->fileName) < 0)
-		{
-			Printf(PRINT_BOLD, "%s: map file not found\n", map->fileName.GetChars());
-		}
-
-		DeferredStartGame(map, g_nextskill);
-	}
-}
-
 CCMD(map)
 {
 	if (argv.argc() < 2)
@@ -450,7 +428,24 @@ CCMD(map)
 		return;
 	}
 
-	FString mapname = argv[1];
+	FString mapfilename = argv[1];
+	DefaultExtension(mapfilename, ".map");
+
+	// Check if the map is already defined.
+	auto map = FindMapByName(argv[1]);
+	if (map == nullptr)
+	{
+		map = SetupUserMap(mapfilename, g_gameType & GAMEFLAG_DUKE ? "dethtoll.mid" : nullptr);
+	}
+	if (map)
+	{
+		if (fileSystem.FindFile(map->fileName) < 0)
+		{
+			Printf(PRINT_BOLD, "%s: map file not found\n", map->fileName.GetChars());
+		}
+
+		DeferredStartGame(map, g_nextskill);
+	}
 }
 
 //---------------------------------------------------------------------------