zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 00:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- did some reshuffling on Exhumed's menu.

Browse source 
To allow adding a "User map" item and prevent accidental reset of ongoing games, both the items for starting the campaign and the training map are now in a submenu.
This allows the game to go through the regular startup procedure common to all games, which in turn allows adding the "User map" item to the episode selection.
This commit is contained in:
Christoph Oelckers 2022-01-24 01:00:05 +01:00
parent a252b206d1
commit 2022de845a
4 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/core/gamecontrol.cpp
View file

@ -635,6 +635,11 @@ void SetDefaultStrings()
gSkillNames[3] = "$WELL DONE";
gSkillNames[4] = "$EXTRA CRISPY";
}
// Exhumed has no skills, but we still need a menu with one entry.
else if (isExhumed())
{
gSkillNames[0] = "Default";
}
//Set a few quotes which are used for common handling of a few status messages
quoteMgr.InitializeQuote(23, "$MESSAGES: ON");

7
source/core/menu/razemenu.cpp
View file

@ -150,14 +150,7 @@ bool M_SetSpecialMenu(FName& menu, int param)
return true;
case NAME_Startgame:
case NAME_StartgameNoSkill:
NewGameStartupInfo.Skill = param;
if (menu == NAME_StartgameNoSkill)
{
menu = NAME_Startgame;
NewGameStartupInfo.Episode = param;
NewGameStartupInfo.Skill = 1;
}
if (DoStartGame(NewGameStartupInfo))
{
M_ClearMenus();

1
source/core/namedef_custom.h
View file

@ -2,7 +2,6 @@
xx(IngameMenu)
xx(ListMenuItemBloodDripDrawer)
xx(StartgameNoSkill)
xx(UsermapMenu)
xx(EngineCredits)
xx(EngineCredits2)

21
wadsrc/static/menudef.txt
View file

@ -69,9 +69,9 @@ LISTMENU "MainMenu"
linespacing 22
Animated
ExhumedPlasma
ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 0
ExhumedTextItem "$MNU_NEWGAME", "n", "EpisodeMenu"
ExhumedTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameNoSkill", 1
//ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameNoSkill", 1
ExhumedTextItem "$MNU_OPTIONS", "v", "OptionsMenu"
ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu"
}
@ -143,9 +143,9 @@ LISTMENU "IngameMenu"
linespacing 22
Animated
ExhumedLogo
ExhumedTextItem "$MNU_NEWGAME", "n", "StartGameNoSkill", 0
ExhumedTextItem "$MNU_NEWGAME", "n", "EpisodeMenu", 0
ExhumedTextItem "$MNU_LOADGAME", "l", "LoadGameMenu"
ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameNoSkill", 1
//ExhumedTextItem "$TXT_EX_MAP00", "m", "StartGameNoSkill", 1
ExhumedTextItem "$MNU_OPTIONS", "v", "OptionsMenu"
ExhumedTextItem "$MNU_QUITGAME", "q", "QuitMenu"
}
@ -181,6 +181,12 @@ LISTMENU "EpisodeMenu"
Position 35, 32
Linespacing 17
}
ifgame(Exhumed)
{
class ExhumedMainMenu
Position 160, 65
linespacing 22
}
}
LISTMENU "SkillMenu"
@ -208,6 +214,13 @@ LISTMENU "SkillMenu"
Position 35, 32
Linespacing 17
}
ifgame(Exhumed)
{
class ExhumedMainMenu
Position 160, 65
linespacing 22
CaptionItem "$MNU_DIFFICULTY"
}
}
//-------------------------------------------------------------------------------------------