From 03e57fa3d7c12b34585e115aea39e8307974b7a4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 9 Oct 2020 23:58:34 +0200 Subject: [PATCH] - fixed Exhumed's game startup. --- source/core/menu/razemenu.cpp | 1 + source/exhumed/src/d_menu.cpp | 4 ++-- wadsrc/static/menudef.txt | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/core/menu/razemenu.cpp b/source/core/menu/razemenu.cpp index e207135f6..18dc8d8a2 100644 --- a/source/core/menu/razemenu.cpp +++ b/source/core/menu/razemenu.cpp @@ -115,6 +115,7 @@ bool M_SetSpecialMenu(FName& menu, int param) case NAME_Startgame: case NAME_StartgameNoSkill: + menu = NAME_Startgame; NewGameStartupInfo.Skill = param; if (menu == NAME_StartgameNoSkill) NewGameStartupInfo.Episode = param; if (gi->StartGame(NewGameStartupInfo)) diff --git a/source/exhumed/src/d_menu.cpp b/source/exhumed/src/d_menu.cpp index c0a271153..d8776bd38 100644 --- a/source/exhumed/src/d_menu.cpp +++ b/source/exhumed/src/d_menu.cpp @@ -92,8 +92,8 @@ void GameInterface::QuitToTitle() bool GameInterface::StartGame(FNewGameStartup& gs) { - auto map = FindMapByLevelNum(gs.Episode); - DeferedStartGame(map, gs.Skill); // 0 is training, 1 is the regular game - the game does not have skill levels. + auto map = FindMapByLevelNum(gs.Skill); // 0 is training, 1 is the regular game - the game does not have skill levels. + DeferedStartGame(map, 1); return true; } diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index d5cd76c9b..97f0ae140 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -62,7 +62,7 @@ LISTMENU "MainMenu" ExhumedPlasma ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 1 ExhumedTextItem "$MNU_LOADGAME", "l", "LoadGameMenu" - ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameSkill", 0 + ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameNoSkill", 0 ExhumedTextItem "$MNU_OPTIONS", "v", "OptionsMenu" ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu" } @@ -132,7 +132,7 @@ LISTMENU "IngameMenu" ExhumedLogo ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 1 ExhumedTextItem "$MNU_LOADGAME", "l", "LoadGameMenu" - ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameSkill", 0 + ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameNoSkill", 0 ExhumedTextItem "$MNU_OPTIONS", "v", "OptionsMenu" ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu" }