From 7d63937d7df1d7bcbda7639c22257821f7bffe87 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Mon, 10 Dec 2007 08:21:25 +0000
Subject: [PATCH] - Fixed: M_VerifyNightmare must use the selected skill level
 to start the   game, not always 4.

SVN r592 (trunk)
---
 docs/rh-log.txt | 4 ++++
 src/m_menu.cpp  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 8ed5a33ff..bf6df028d 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+December 10, 2007 (Changes by Graf Zahl)
+- Fixed: M_VerifyNightmare must use the selected skill level to start the
+  game, not always 4.
+
 December 9, 2007 (Changes by Graf Zahl)
 - Fixed: There was no working means to pass 'no state' to A_Chase.
   Now 0 or an empty string will do that.
diff --git a/src/m_menu.cpp b/src/m_menu.cpp
index cf36154a8..7efa8fe18 100644
--- a/src/m_menu.cpp
+++ b/src/m_menu.cpp
@@ -1723,12 +1723,14 @@ void M_DrawEpisode ()
 	}
 }
 
+static int confirmskill;
+
 void M_VerifyNightmare (int ch)
 {
 	if (ch != 'y')
 		return;
 		
-	G_DeferedInitNew (EpisodeMaps[epi], 4);
+	G_DeferedInitNew (EpisodeMaps[epi], confirmskill);
 	if (gamestate == GS_FULLCONSOLE)
 	{
 		gamestate = GS_HIDECONSOLE;
@@ -1744,6 +1746,7 @@ void M_ChooseSkill (int choice)
 		const char *msg = AllSkills[choice].MustConfirmText;
 		if (*msg==0) msg = GStrings("NIGHTMARE");
 		if (*msg=='$') msg = GStrings(msg+1);
+		confirmskill = choice;
 		M_StartMessage (msg, M_VerifyNightmare, true);
 		return;
 	}