stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 01:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move menu options around

Browse source 
1 Player now goes directly to Time Attack, and Extras
is now a submenu with Unlockables, Statistics, and a
currently-dummied option for Replay Hut.
This commit is contained in:
fickleheart 2019-03-30 17:25:54 -05:00
parent 2a9dd8e1f9
commit 6cc875bb50
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/m_menu.c
View file

@ -233,7 +233,9 @@ static char *M_GetConditionString(condition_t cond);
menu_t SR_MainDef, SR_UnlockChecklistDef;
// Misc. Main Menu
#if 0 // Bring this back when we have actual single-player
static void M_SinglePlayerMenu(INT32 choice);
#endif
static void M_Options(INT32 choice);
static void M_Manual(INT32 choice);
static void M_SelectableClearMenus(INT32 choice);
@ -500,8 +502,9 @@ static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaf
// ---------
static menuitem_t MainMenu[] =
{
{IT_SUBMENU|IT_STRING, NULL, "Extras", &SR_UnlockChecklistDef, 76},
{IT_CALL |IT_STRING, NULL, "1 Player", M_SinglePlayerMenu, 84},
{IT_SUBMENU|IT_STRING, NULL, "Extras", &SR_MainDef, 76},
//{IT_CALL |IT_STRING, NULL, "1 Player", M_SinglePlayerMenu, 84},
{IT_CALL |IT_STRING, NULL, "Time Attack", M_TimeAttack, 84},
{IT_SUBMENU|IT_STRING, NULL, "Multiplayer", &MP_MainDef, 92},
{IT_CALL |IT_STRING, NULL, "Options", M_Options, 100},
{IT_CALL |IT_STRING, NULL, "Addons", M_Addons, 108},
@ -695,7 +698,9 @@ static menuitem_t SR_PandorasBox[] =
// Sky Room Custom Unlocks
static menuitem_t SR_MainMenu[] =
{
{IT_STRING|IT_SUBMENU,NULL, "Secrets Checklist", &SR_UnlockChecklistDef, 0},
{IT_STRING|IT_SUBMENU, NULL, "Unlockables", &SR_UnlockChecklistDef, 0},
{IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED, NULL, "Statistics", M_Statistics, 10},
{IT_CALL|IT_STRING, NULL, "Replay Hut", M_Statistics, 20},
{IT_DISABLED, NULL, "", NULL, 0}, // Custom1
{IT_DISABLED, NULL, "", NULL, 0}, // Custom2
{IT_DISABLED, NULL, "", NULL, 0}, // Custom3
@ -1681,7 +1686,8 @@ menu_t SR_MainDef =
sizeof (SR_MainMenu)/sizeof (menuitem_t),
&MainDef,
SR_MainMenu,
M_DrawSkyRoom,
M_DrawGenericMenu,
//M_DrawSkyRoom,
60, 40,
0,
NULL
@ -1693,7 +1699,7 @@ menu_t SR_UnlockChecklistDef =
{
NULL,
1,
&MainDef, //&SR_MainDef
&SR_MainDef,
SR_UnlockChecklistMenu,
M_DrawChecklist,
280, 185,
@ -1731,7 +1737,7 @@ menu_t SP_LevelStatsDef =
{
"M_STATS",
1,
&SP_MainDef,
&SR_MainDef,
SP_LevelStatsMenu,
M_DrawLevelStats,
280, 185,
@ -5619,6 +5625,7 @@ static void M_Credits(INT32 choice)
// SINGLE PLAYER MENU
// ==================
#if 0 // Bring this back when we have actual single-player
static void M_SinglePlayerMenu(INT32 choice)
{
(void)choice;
@ -5629,6 +5636,7 @@ static void M_SinglePlayerMenu(INT32 choice)
M_SetupNextMenu(&SP_MainDef);
}
#endif
/*static void M_LoadGameLevelSelect(INT32 choice)
{