From eaac9de1a4bbf00f7a7c1a4f802ac84fc8b4c9e3 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 27 Dec 2021 09:26:56 +0100
Subject: [PATCH] - Added skill selection for user maps.

---
 source/core/gamestruct.h      |  2 ++
 source/core/menu/razemenu.cpp | 35 +++++++++++++++++++++++------------
 source/core/menu/usermap.cpp  | 10 ++++------
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/source/core/gamestruct.h b/source/core/gamestruct.h
index f25ab01e3..d68af8a60 100644
--- a/source/core/gamestruct.h
+++ b/source/core/gamestruct.h
@@ -16,6 +16,7 @@ struct spritetype;
 struct sectortype;
 struct tspritetype;
 class DCoreActor;
+struct MapRecord;
 
 struct GameStats
 {
@@ -27,6 +28,7 @@ struct GameStats
 
 struct FNewGameStartup
 {
+	MapRecord* Map;
 	int Episode;
 	int Level;
 	int Skill;
diff --git a/source/core/menu/razemenu.cpp b/source/core/menu/razemenu.cpp
index 9a7f362ba..8e8a10037 100644
--- a/source/core/menu/razemenu.cpp
+++ b/source/core/menu/razemenu.cpp
@@ -90,17 +90,24 @@ FNewGameStartup NewGameStartupInfo;
 
 static bool DoStartGame(FNewGameStartup& gs)
 {
-	auto vol = FindVolume(gs.Episode);
-	if (!vol) return false;
-
-	if (isShareware() && (vol->flags & VF_SHAREWARELOCK))
+	MapRecord* map;
+	if (gs.Map == nullptr)
 	{
-		M_StartMessage(GStrings("SHAREWARELOCK"), 1, NAME_None);
-		return false;
-	}
+		auto vol = FindVolume(gs.Episode);
+		if (!vol) return false;
+
+		if (isShareware() && (vol->flags & VF_SHAREWARELOCK))
+		{
+			M_StartMessage(GStrings("SHAREWARELOCK"), 1, NAME_None);
+			return false;
+		}
+
+		map = FindMapByName(vol->startmap);
+		if (!map) return false;
+	}
+	else
+		map = gs.Map;
 
-	auto map = FindMapByName(vol->startmap);
-	if (!map) return false;
 	soundEngine->StopAllChannels();
 
 	gi->StartGame(gs);	// play game specific effects (like Duke/RR/SW's voice lines when starting a game.)
@@ -132,9 +139,13 @@ bool M_SetSpecialMenu(FName& menu, int param)
 		break;
 
 	case NAME_Skillmenu:
-		// sent from the episode menu
-		NewGameStartupInfo.Episode = param;
-		NewGameStartupInfo.Level = 0;
+		// sent from the episode or user map menu
+		if (param != INT_MAX)
+		{
+			NewGameStartupInfo.Map = nullptr;
+			NewGameStartupInfo.Episode = param;
+			NewGameStartupInfo.Level = 0;
+		}
 		NewGameStartupInfo.Skill = gDefaultSkill;
 		return true;
 
diff --git a/source/core/menu/usermap.cpp b/source/core/menu/usermap.cpp
index 73ae1310e..5f928bb4b 100644
--- a/source/core/menu/usermap.cpp
+++ b/source/core/menu/usermap.cpp
@@ -253,8 +253,6 @@ DEFINE_ACTION_FUNCTION(_UserMapMenu, DrawPreview)
 	return 0;
 }
 
-void DoStartMap(FString mapname);
-
 DEFINE_ACTION_FUNCTION(_UsermapMenu, StartMap)
 {
 	PARAM_PROLOGUE;
@@ -264,9 +262,9 @@ DEFINE_ACTION_FUNCTION(_UsermapMenu, StartMap)
 	{
 		ThrowAbortException(X_OTHER, "Attempt to start user map outside of menu code");
 	}
-
-	DoStartMap(entry->filename);
-	M_ClearMenus();
-	UnloadMapPreviews(&root);
+	NewGameStartupInfo.Episode = -1;
+	NewGameStartupInfo.Level = -1;
+	NewGameStartupInfo.Map = SetupUserMap(entry->filename, g_gameType & GAMEFLAG_DUKE ? "dethtoll.mid" : nullptr);
+	M_SetMenu(NAME_Skillmenu, INT_MAX);
 	return 0;
 }