From ddd5fe753547d113c0c3ec2696154de2855e54d8 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 24 Jan 2012 03:25:06 +0000 Subject: [PATCH] - Fixed: If an episode skips the skill menu, it should also skip the confirm skill menu if the default skill requests confirmation. SVN r3347 (trunk) --- src/menu/menudef.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 4390f1675..25d859ea6 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -1320,8 +1320,8 @@ void M_StartupSkillMenu(FGameStartup *gs) FSkillInfo &skill = AllSkills[i]; FListMenuItem *li; // Using a different name for skills that must be confirmed makes handling this easier. - FName action = skill.MustConfirm? NAME_StartgameConfirm : NAME_Startgame; - + FName action = (skill.MustConfirm && !AllEpisodes[gs->Episode].mNoSkill) ? + NAME_StartgameConfirm : NAME_Startgame; FString *pItemText = NULL; if (gs->PlayerClass != NULL) { @@ -1388,7 +1388,8 @@ fail: FSkillInfo &skill = AllSkills[i]; FOptionMenuItem *li; // Using a different name for skills that must be confirmed makes handling this easier. - const char *action = skill.MustConfirm? "StartgameConfirm" : "Startgame"; + const char *action = (skill.MustConfirm && !AllEpisodes[gs->Episode].mNoSkill) ? + "StartgameConfirm" : "Startgame"; FString *pItemText = NULL; if (gs->PlayerClass != NULL)