From d20c3f1db35a809dd422337b5a44cb1752b1df6e Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Thu, 26 Mar 2020 08:24:27 +0100
Subject: [PATCH] Menu: Set the difficulty in the New Game menu

---
 src/menu-fn/m_newgame.cpp | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/menu-fn/m_newgame.cpp b/src/menu-fn/m_newgame.cpp
index 950b5b23..5bfde65c 100644
--- a/src/menu-fn/m_newgame.cpp
+++ b/src/menu-fn/m_newgame.cpp
@@ -25,7 +25,7 @@ void ng_btneasy_start(void)
 {
 	static void ng_btneasy_end(void) {
 		g_menupage = PAGE_MAIN;
-		localcmd("maxplayers 1\n");
+		localcmd("set skill 1; maxplayers 1\n");
 		localcmd(sprintf("map %s\n", games[gameinfo_current].startmap));
 	}
 	localsound("../media/launch_upmenu1.wav");
@@ -36,6 +36,36 @@ void ng_btneasy_start(void)
 	header.SetHeader(HEAD_NEWGAME);
 	header.SetExecute(ng_btneasy_end);
 }
+void ng_btnnormal_start(void)
+{
+	static void ng_btnnormal_end(void) {
+		g_menupage = PAGE_MAIN;
+		localcmd("set skill 2; maxplayers 1\n");
+		localcmd(sprintf("map %s\n", games[gameinfo_current].startmap));
+	}
+	localsound("../media/launch_upmenu1.wav");
+	header.SetStartEndPos(45,45,70,208);
+	header.SetStartEndSize(460,80,156,26);
+	header.m_lerp = 0.0f;
+	header.m_visible = TRUE;
+	header.SetHeader(HEAD_NEWGAME);
+	header.SetExecute(ng_btnnormal_end);
+}
+void ng_btnhard_start(void)
+{
+	static void ng_btnhard_end(void) {
+		g_menupage = PAGE_MAIN;
+		localcmd("set skill 3; maxplayers 1\n");
+		localcmd(sprintf("map %s\n", games[gameinfo_current].startmap));
+	}
+	localsound("../media/launch_upmenu1.wav");
+	header.SetStartEndPos(45,45,70,208);
+	header.SetStartEndSize(460,80,156,26);
+	header.m_lerp = 0.0f;
+	header.m_visible = TRUE;
+	header.SetHeader(HEAD_NEWGAME);
+	header.SetExecute(ng_btnhard_end);
+}
 
 void ng_btncancel_start(void)
 {
@@ -68,9 +98,9 @@ void menu_newgame_init(void)
 	ng_btnEasy.SetImage(BTN_EASY);
 	ng_btnEasy.SetExecute(ng_btneasy_start);
 	ng_btnMedium.SetImage(BTN_MEDIUM);
-	ng_btnMedium.SetExecute(ng_btneasy_start);
+	ng_btnMedium.SetExecute(ng_btnnormal_start);
 	ng_btnDifficult.SetImage(BTN_DIFFICULT);
-	ng_btnDifficult.SetExecute(ng_btneasy_start);
+	ng_btnDifficult.SetExecute(ng_btnhard_start);
 	ng_btnCancel.SetImage(BTN_CANCEL);
 	ng_btnCancel.SetExecute(ng_btncancel_start);