From 3f69b63873cc4d61f145d6d33ced570a08bff8d9 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 25 Sep 2010 23:28:44 +0000 Subject: [PATCH] - fixed: Backing out of a skill confirmation message screen caused that skill to be used for the next game if the menu wasn't fully closed first. SVN r2851 (trunk) --- src/menu/menu.cpp | 5 +++-- src/namedef.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index 2732b7cfb2..c0ef72a31c 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -382,14 +382,15 @@ void M_SetMenu(FName menu, int param) const char *msg = AllSkills[param].MustConfirmText; if (*msg==0) msg = GStrings("NIGHTMARE"); - M_StartMessage (msg, 0, NAME_Startgame); + M_StartMessage (msg, 0, NAME_StartgameConfirmed); return; } case NAME_Startgame: // sent either from skill menu or confirmation screen. Skill gets only set if sent from skill menu // Now we can finally start the game. Ugh... - if (GameStartupInfo.Skill == -1) GameStartupInfo.Skill = param; + GameStartupInfo.Skill = param; + case NAME_StartgameConfirmed: G_DeferedInitNew (&GameStartupInfo); if (gamestate == GS_FULLCONSOLE) diff --git a/src/namedef.h b/src/namedef.h index 012d85afa4..ecbe978653 100644 --- a/src/namedef.h +++ b/src/namedef.h @@ -475,6 +475,7 @@ xx(HexenDefaultPlayerclassmenu) xx(Skillmenu) xx(Startgame) xx(StartgameConfirm) +xx(StartgameConfirmed) xx(Loadgamemenu) xx(Savegamemenu) xx(Readthismenu)