zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed Exhumed's game startup.

This commit is contained in:
Christoph Oelckers 2020-10-09 23:58:34 +02:00
parent fb6267dce0
commit 03e57fa3d7
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/core/menu/razemenu.cpp
View File

@ -115,6 +115,7 @@ bool M_SetSpecialMenu(FName& menu, int param)
case NAME_Startgame: case NAME_Startgame:
case NAME_StartgameNoSkill: case NAME_StartgameNoSkill:
menu = NAME_Startgame;
NewGameStartupInfo.Skill = param; NewGameStartupInfo.Skill = param;
if (menu == NAME_StartgameNoSkill) NewGameStartupInfo.Episode = param; if (menu == NAME_StartgameNoSkill) NewGameStartupInfo.Episode = param;
if (gi->StartGame(NewGameStartupInfo)) if (gi->StartGame(NewGameStartupInfo))

4
source/exhumed/src/d_menu.cpp
View File

@ -92,8 +92,8 @@ void GameInterface::QuitToTitle()
bool GameInterface::StartGame(FNewGameStartup& gs) bool GameInterface::StartGame(FNewGameStartup& gs)
{ {
auto map = FindMapByLevelNum(gs.Episode); auto map = FindMapByLevelNum(gs.Skill); // 0 is training, 1 is the regular game - the game does not have skill levels.
DeferedStartGame(map, gs.Skill); // 0 is training, 1 is the regular game - the game does not have skill levels. DeferedStartGame(map, 1);
return true; return true;
} }

4
wadsrc/static/menudef.txt
View File

@ -62,7 +62,7 @@ LISTMENU "MainMenu"
ExhumedPlasma ExhumedPlasma
ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 1 ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 1
ExhumedTextItem "$MNU_LOADGAME", "l", "LoadGameMenu" 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_OPTIONS", "v", "OptionsMenu"
ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu" ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu"
} }
@ -132,7 +132,7 @@ LISTMENU "IngameMenu"
ExhumedLogo ExhumedLogo
ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 1 ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 1
ExhumedTextItem "$MNU_LOADGAME", "l", "LoadGameMenu" 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_OPTIONS", "v", "OptionsMenu"
ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu" ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu"
} }