Skip to content

Commit

Permalink
Fixed couple of minor bugs in the menu that must have inadvertently c…
Browse files Browse the repository at this point in the history
…rept in due to me working with several local branches atm.

* ccmd "menuback" once again works.
* "quit game" menu option in jHexen now quits as expected (as opposed to displaying the info pages).
  • Loading branch information
danij committed Dec 23, 2008
1 parent 022788e commit 5f0bd67
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions doomsday/plugins/common/src/hu_menu.c
Expand Up @@ -326,6 +326,12 @@ static dpatch_t m_htic;
static dpatch_t dpFSlot;
#endif

#if __JHERETIC__ || __JHEXEN__
# define READTHISID 3
#elif !__JDOOM64__
# define READTHISID 4
#endif

menuitem_t MainItems[] = {
#if __JDOOM__
{ITT_SETMENU, 0, "{case}New Game", NULL, MENU_NEWGAME, &m_ngame},
Expand All @@ -340,13 +346,6 @@ menuitem_t MainItems[] = {
{ITT_EFUNC, 0, "{case}Load Game", M_LoadGame, 0},
{ITT_EFUNC, 0, "{case}Save Game", M_SaveGame, 0},
{ITT_EFUNC, 0, "{case}Quit Game", M_QuitDOOM, 0}
#elif __JSTRIFE__
{ITT_SETMENU, 0, "N", NULL, MENU_NEWGAME},
{ITT_SETMENU, 0, "O", NULL, MENU_OPTIONS},
{ITT_EFUNC, 0, "L", M_LoadGame, 0},
{ITT_EFUNC, 0, "S", M_SaveGame, 0},
{ITT_EFUNC, 0, "R", M_ReadThis, 0},
{ITT_EFUNC, 0, "Q", M_QuitDOOM, 0}
#else
{ITT_SETMENU, 0, "new game", NULL, MENU_NEWGAME},
{ITT_SETMENU, 0, "options", NULL, MENU_OPTIONS},
Expand Down Expand Up @@ -1200,15 +1199,15 @@ cvar_t menuCVars[] =
};

// Console commands for the menu
ccmd_t menuCCmds[] = {
ccmd_t menuCCmds[] = {
{"menu", "", CCmdMenuAction},
{"menuup", "", CCmdMenuAction},
{"menudown", "", CCmdMenuAction},
{"menuleft", "", CCmdMenuAction},
{"menuright", "", CCmdMenuAction},
{"menuselect", "", CCmdMenuAction},
{"menudelete", "", CCmdMenuAction},
{"menucancel", "", CCmdMenuAction},
{"menuback", "", CCmdMenuAction},
{"helpscreen", "", CCmdMenuAction},
{"savegame", "", CCmdMenuAction},
{"loadgame", "", CCmdMenuAction},
Expand Down Expand Up @@ -1483,7 +1482,7 @@ void Hu_MenuInit(void)
}
#else
# if !__JDOOM64__
item = &MainItems[4]; // Read This!
item = &MainItems[READTHISID]; // Read This!
item->func = M_ReadThis;
# endif
#endif
Expand Down Expand Up @@ -3898,7 +3897,7 @@ DEFCC(CCmdMenuAction)
}
return true;
}
else if(!stricmp(argv[0], "menucancel"))
else if(!stricmp(argv[0], "menuback"))
{
int c;

Expand Down

0 comments on commit 5f0bd67

Please sign in to comment.