zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-14 00:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: Move "Cheats" from Options to Game Setup.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5517 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-01-08 01:32:47 +00:00
parent d5b22a714f
commit c2b5ae8256
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/eduke32/source/menus.c
View file

@ -385,6 +385,9 @@ static MenuOption_t MEO_GAMESETUP_QUICKSWITCH = MAKE_MENUOPTION(&MF_Redfont, &ME
static MenuEntry_t ME_GAMESETUP_QUICKSWITCH = MAKE_MENUENTRY("Quick weapon switch:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_GAMESETUP_QUICKSWITCH, Option); static MenuEntry_t ME_GAMESETUP_QUICKSWITCH = MAKE_MENUENTRY("Quick weapon switch:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_GAMESETUP_QUICKSWITCH, Option);
#endif #endif
static MenuLink_t MEO_GAMESETUP_CHEATS = { MENU_CHEATS, MA_Advance, };
static MenuEntry_t ME_GAMESETUP_CHEATS = MAKE_MENUENTRY( "Cheats", &MF_Redfont, &MEF_BigOptionsRt, &MEO_GAMESETUP_CHEATS, Link );
static MenuEntry_t *MEL_GAMESETUP[] = { static MenuEntry_t *MEL_GAMESETUP[] = {
&ME_ADULTMODE, &ME_ADULTMODE,
#if defined STARTUP_SETUP_WINDOW && !defined DROIDMENU #if defined STARTUP_SETUP_WINDOW && !defined DROIDMENU
@ -401,6 +404,7 @@ static MenuEntry_t *MEL_GAMESETUP[] = {
&ME_GAMESETUP_UPDATES, &ME_GAMESETUP_UPDATES,
#endif #endif
#endif #endif
&ME_GAMESETUP_CHEATS,
}; };
MAKE_MENU_TOP_ENTRYLINK( "Game Setup", MEF_CenterMenu, OPTIONS_GAMESETUP, MENU_GAMESETUP ); MAKE_MENU_TOP_ENTRYLINK( "Game Setup", MEF_CenterMenu, OPTIONS_GAMESETUP, MENU_GAMESETUP );
@ -416,7 +420,6 @@ MAKE_MENU_TOP_ENTRYLINK( "Joystick Setup", MEF_CenterMenu, OPTIONS_JOYSTICKSETUP
#ifdef DROIDMENU #ifdef DROIDMENU
MAKE_MENU_TOP_ENTRYLINK( "Touch Setup", MEF_CenterMenu, OPTIONS_TOUCHSETUP, MENU_TOUCHSETUP ); MAKE_MENU_TOP_ENTRYLINK( "Touch Setup", MEF_CenterMenu, OPTIONS_TOUCHSETUP, MENU_TOUCHSETUP );
#endif #endif
MAKE_MENU_TOP_ENTRYLINK( "Cheats", MEF_CenterMenu, OPTIONS_CHEATS, MENU_CHEATS );
static int32_t newresolution, newrendermode, newfullscreen, newvsync; static int32_t newresolution, newrendermode, newfullscreen, newvsync;
@ -614,7 +617,6 @@ static MenuEntry_t *MEL_OPTIONS[] = {
#else #else
&ME_OPTIONS_TOUCHSETUP, &ME_OPTIONS_TOUCHSETUP,
#endif #endif
&ME_OPTIONS_CHEATS
}; };
static MenuEntry_t *MEL_CONTROLS[] = { static MenuEntry_t *MEL_CONTROLS[] = {
@ -1331,7 +1333,7 @@ static Menu_t Menus[] = {
{ &M_SOUND, MENU_SOUND, MENU_OPTIONS, MA_Return, Menu }, { &M_SOUND, MENU_SOUND, MENU_OPTIONS, MA_Return, Menu },
{ &M_SOUND, MENU_SOUND_INGAME, MENU_CLOSE, MA_Return, Menu }, { &M_SOUND, MENU_SOUND_INGAME, MENU_CLOSE, MA_Return, Menu },
{ &M_ADVSOUND, MENU_ADVSOUND, MENU_SOUND, MA_Return, Menu }, { &M_ADVSOUND, MENU_ADVSOUND, MENU_SOUND, MA_Return, Menu },
{ &M_CHEATS, MENU_CHEATS, MENU_OPTIONS, MA_Return, Menu }, { &M_CHEATS, MENU_CHEATS, MENU_GAMESETUP, MA_Return, Menu },
{ &M_CHEATENTRY, MENU_CHEATENTRY, MENU_CHEATS, MA_None, TextForm }, { &M_CHEATENTRY, MENU_CHEATENTRY, MENU_CHEATS, MA_None, TextForm },
{ &M_CHEAT_WARP, MENU_CHEAT_WARP, MENU_CHEATS, MA_None, TextForm }, { &M_CHEAT_WARP, MENU_CHEAT_WARP, MENU_CHEATS, MA_None, TextForm },
{ &M_CHEAT_SKILL, MENU_CHEAT_SKILL, MENU_CHEATS, MA_None, TextForm }, { &M_CHEAT_SKILL, MENU_CHEAT_SKILL, MENU_CHEATS, MA_None, TextForm },