diff --git a/src/dehacked.c b/src/dehacked.c index 5c41f1d50..ed50aa970 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -8541,17 +8541,17 @@ static hudnum_t get_huditem(const char *word) } static menutype_t get_menutype(const char *word) -{ // Returns the value of MM_ enumerations +{ // Returns the value of MN_ enumerations menutype_t i; if (*word >= '0' && *word <= '9') return atoi(word); - if (fastncmp("MM_",word,3)) - word += 3; // take off the MM_ + if (fastncmp("MN_",word,3)) + word += 3; // take off the MN_ for (i = 0; i < NUMMENUTYPES; i++) if (fastcmp(word, MENUTYPES_LIST[i])) return i; - deh_warning("Couldn't find menutype named 'MM_%s'",word); - return MM_NONE; + deh_warning("Couldn't find menutype named 'MN_%s'",word); + return MN_NONE; } #ifndef HAVE_BLUA @@ -9218,7 +9218,7 @@ static inline int lib_getenum(lua_State *L) if (mathlib) return luaL_error(L, "skincolor '%s' could not be found.\n", word); return 0; } - else if (fastncmp("MM_",word,3)) { + else if (fastncmp("MN_",word,3)) { p = word+3; for (i = 0; i < NUMMENUTYPES; i++) if (fastcmp(p, MENUTYPES_LIST[i])) { diff --git a/src/m_menu.c b/src/m_menu.c index b16083695..741694ffa 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1473,11 +1473,11 @@ static menuitem_t OP_MonitorToggleMenu[] = // ========================================================================== // Main Menu and related -menu_t MainDef = CENTERMENUSTYLE(MM_MAIN, NULL, MainMenu, NULL, 72); +menu_t MainDef = CENTERMENUSTYLE(MN_MAIN, NULL, MainMenu, NULL, 72); menu_t MISC_AddonsDef = { - MM_AD_MAIN, + MN_AD_MAIN, NULL, sizeof (MISC_AddonsMenu)/sizeof (menuitem_t), &MainDef, @@ -1493,13 +1493,13 @@ menu_t SPauseDef = PAUSEMENUSTYLE(SPauseMenu, 40, 72); menu_t MPauseDef = PAUSEMENUSTYLE(MPauseMenu, 40, 72); // Misc Main Menu -menu_t MISC_ScrambleTeamDef = DEFAULTMENUSTYLE(MM_SPECIAL, NULL, MISC_ScrambleTeamMenu, &MPauseDef, 27, 40); -menu_t MISC_ChangeTeamDef = DEFAULTMENUSTYLE(MM_SPECIAL, NULL, MISC_ChangeTeamMenu, &MPauseDef, 27, 40); +menu_t MISC_ScrambleTeamDef = DEFAULTMENUSTYLE(MN_SPECIAL, NULL, MISC_ScrambleTeamMenu, &MPauseDef, 27, 40); +menu_t MISC_ChangeTeamDef = DEFAULTMENUSTYLE(MN_SPECIAL, NULL, MISC_ChangeTeamMenu, &MPauseDef, 27, 40); // MP Gametype and map change menu menu_t MISC_ChangeLevelDef = { - MM_SPECIAL, + MN_SPECIAL, NULL, sizeof (MISC_ChangeLevelMenu)/sizeof (menuitem_t), &MainDef, // Doesn't matter. @@ -1515,7 +1515,7 @@ menu_t MISC_HelpDef = IMAGEDEF(MISC_HelpMenu); // Sky Room menu_t SR_PandoraDef = { - MM_SR_MAIN + (MM_SR_PANDORA << 6), + MN_SR_MAIN + (MN_SR_PANDORA << 6), "M_PANDRA", sizeof (SR_PandorasBox)/sizeof (menuitem_t), &SPauseDef, @@ -1527,7 +1527,7 @@ menu_t SR_PandoraDef = }; menu_t SR_MainDef = { - MM_SR_MAIN, + MN_SR_MAIN, "M_SECRET", sizeof (SR_MainMenu)/sizeof (menuitem_t), &MainDef, @@ -1539,12 +1539,12 @@ menu_t SR_MainDef = }; menu_t SR_LevelSelectDef = MAPPLATTERMENUSTYLE( - MM_SR_MAIN + (MM_SR_LEVELSELECT << 6), + MN_SR_MAIN + (MN_SR_LEVELSELECT << 6), NULL, SR_LevelSelectMenu); menu_t SR_UnlockChecklistDef = { - MM_SR_MAIN + (MM_SR_UNLOCKCHECKLIST << 6), + MN_SR_MAIN + (MN_SR_UNLOCKCHECKLIST << 6), "M_SECRET", 1, &SR_MainDef, @@ -1556,7 +1556,7 @@ menu_t SR_UnlockChecklistDef = }; menu_t SR_EmblemHintDef = { - MM_SR_MAIN + (MM_SR_EMBLEMHINT << 6), + MN_SR_MAIN + (MN_SR_EMBLEMHINT << 6), NULL, sizeof (SR_EmblemHintMenu)/sizeof (menuitem_t), &SPauseDef, @@ -1570,7 +1570,7 @@ menu_t SR_EmblemHintDef = // Single Player menu_t SP_MainDef = //CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72); { - MM_SP_MAIN, + MN_SP_MAIN, NULL, sizeof(SP_MainMenu)/sizeof(menuitem_t), &MainDef, @@ -1583,7 +1583,7 @@ menu_t SP_MainDef = //CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72); menu_t SP_LoadDef = { - MM_SP_MAIN + (MM_SP_LOAD << 6), + MN_SP_MAIN + (MN_SP_LOAD << 6), "M_PICKG", 1, &SP_MainDef, @@ -1595,12 +1595,12 @@ menu_t SP_LoadDef = }; menu_t SP_LevelSelectDef = MAPPLATTERMENUSTYLE( - MM_SP_MAIN + (MM_SP_LOAD << 6) + (MM_SP_PLAYER << 12) + (MM_SP_LEVELSELECT << 18), + MN_SP_MAIN + (MN_SP_LOAD << 6) + (MN_SP_PLAYER << 12) + (MN_SP_LEVELSELECT << 18), NULL, SP_LevelSelectMenu); menu_t SP_LevelStatsDef = { - MM_SP_MAIN + (MM_SP_LEVELSTATS << 6), + MN_SP_MAIN + (MN_SP_LEVELSTATS << 6), "M_STATS", 1, &SP_MainDef, @@ -1612,12 +1612,12 @@ menu_t SP_LevelStatsDef = }; menu_t SP_TimeAttackLevelSelectDef = MAPPLATTERMENUSTYLE( - MM_SP_MAIN + (MM_SP_TIMEATTACK << 6) + (MM_SP_TIMEATTACK_LEVELSELECT << 12), + MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_TIMEATTACK_LEVELSELECT << 12), "M_ATTACK", SP_TimeAttackLevelSelectMenu); static menu_t SP_TimeAttackDef = { - MM_SP_MAIN + (MM_SP_TIMEATTACK << 6), + MN_SP_MAIN + (MN_SP_TIMEATTACK << 6), "M_ATTACK", sizeof (SP_TimeAttackMenu)/sizeof (menuitem_t), &MainDef, // Doesn't matter. @@ -1629,7 +1629,7 @@ static menu_t SP_TimeAttackDef = }; static menu_t SP_ReplayDef = { - MM_SP_MAIN + (MM_SP_TIMEATTACK << 6) + (MM_SP_REPLAY << 12), + MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_REPLAY << 12), "M_ATTACK", sizeof(SP_ReplayMenu)/sizeof(menuitem_t), &SP_TimeAttackDef, @@ -1641,7 +1641,7 @@ static menu_t SP_ReplayDef = }; static menu_t SP_GuestReplayDef = { - MM_SP_MAIN + (MM_SP_TIMEATTACK << 6) + (MM_SP_GUESTREPLAY << 12), + MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_GUESTREPLAY << 12), "M_ATTACK", sizeof(SP_GuestReplayMenu)/sizeof(menuitem_t), &SP_TimeAttackDef, @@ -1653,7 +1653,7 @@ static menu_t SP_GuestReplayDef = }; static menu_t SP_GhostDef = { - MM_SP_MAIN + (MM_SP_TIMEATTACK << 6) + (MM_SP_GHOST << 12), + MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_GHOST << 12), "M_ATTACK", sizeof(SP_GhostMenu)/sizeof(menuitem_t), &SP_TimeAttackDef, @@ -1665,12 +1665,12 @@ static menu_t SP_GhostDef = }; menu_t SP_NightsAttackLevelSelectDef = MAPPLATTERMENUSTYLE( - MM_SP_MAIN + (MM_SP_NIGHTSATTACK << 6) + (MM_SP_NIGHTS_LEVELSELECT << 12), + MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_LEVELSELECT << 12), "M_NIGHTS", SP_NightsAttackLevelSelectMenu); static menu_t SP_NightsAttackDef = { - MM_SP_MAIN + (MM_SP_NIGHTSATTACK << 6), + MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6), "M_NIGHTS", sizeof (SP_NightsAttackMenu)/sizeof (menuitem_t), &MainDef, // Doesn't matter. @@ -1682,7 +1682,7 @@ static menu_t SP_NightsAttackDef = }; static menu_t SP_NightsReplayDef = { - MM_SP_MAIN + (MM_SP_NIGHTSATTACK << 6) + (MM_SP_NIGHTS_REPLAY << 12), + MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_REPLAY << 12), "M_NIGHTS", sizeof(SP_NightsReplayMenu)/sizeof(menuitem_t), &SP_NightsAttackDef, @@ -1694,7 +1694,7 @@ static menu_t SP_NightsReplayDef = }; static menu_t SP_NightsGuestReplayDef = { - MM_SP_MAIN + (MM_SP_NIGHTSATTACK << 6) + (MM_SP_NIGHTS_GUESTREPLAY << 12), + MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_GUESTREPLAY << 12), "M_NIGHTS", sizeof(SP_NightsGuestReplayMenu)/sizeof(menuitem_t), &SP_NightsAttackDef, @@ -1706,7 +1706,7 @@ static menu_t SP_NightsGuestReplayDef = }; static menu_t SP_NightsGhostDef = { - MM_SP_MAIN + (MM_SP_NIGHTSATTACK << 6) + (MM_SP_NIGHTS_GHOST << 12), + MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_GHOST << 12), "M_NIGHTS", sizeof(SP_NightsGhostMenu)/sizeof(menuitem_t), &SP_NightsAttackDef, @@ -1720,7 +1720,7 @@ static menu_t SP_NightsGhostDef = menu_t SP_PlayerDef = { - MM_SP_MAIN + (MM_SP_LOAD << 6) + (MM_SP_PLAYER << 12), + MN_SP_MAIN + (MN_SP_LOAD << 6) + (MN_SP_PLAYER << 12), "M_PICKP", sizeof (SP_PlayerMenu)/sizeof (menuitem_t), &SP_MainDef, @@ -1735,7 +1735,7 @@ menu_t SP_PlayerDef = menu_t MP_SplitServerDef = { - MM_MP_MAIN + (MM_MP_SPLITSCREEN << 6), + MN_MP_MAIN + (MN_MP_SPLITSCREEN << 6), "M_MULTI", sizeof (MP_SplitServerMenu)/sizeof (menuitem_t), #ifndef NONET @@ -1754,7 +1754,7 @@ menu_t MP_SplitServerDef = menu_t MP_MainDef = { - MM_MP_MAIN, + MN_MP_MAIN, "M_MULTI", sizeof (MP_MainMenu)/sizeof (menuitem_t), &MainDef, @@ -1767,7 +1767,7 @@ menu_t MP_MainDef = menu_t MP_ServerDef = { - MM_MP_MAIN + (MM_MP_SERVER << 6), + MN_MP_MAIN + (MN_MP_SERVER << 6), "M_MULTI", sizeof (MP_ServerMenu)/sizeof (menuitem_t), &MP_MainDef, @@ -1780,7 +1780,7 @@ menu_t MP_ServerDef = menu_t MP_ConnectDef = { - MM_MP_MAIN + (MM_MP_CONNECT << 6), + MN_MP_MAIN + (MN_MP_CONNECT << 6), "M_MULTI", sizeof (MP_ConnectMenu)/sizeof (menuitem_t), &MP_MainDef, @@ -1793,7 +1793,7 @@ menu_t MP_ConnectDef = menu_t MP_RoomDef = { - MM_MP_MAIN + (MM_MP_ROOM << 6), + MN_MP_MAIN + (MN_MP_ROOM << 6), "M_MULTI", sizeof (MP_RoomMenu)/sizeof (menuitem_t), &MP_ConnectDef, @@ -1808,9 +1808,9 @@ menu_t MP_RoomDef = menu_t MP_PlayerSetupDef = { #ifdef NONET - MM_MP_MAIN + (MM_MP_SPLITSCREEN << 6) + (MM_MP_PLAYERSETUP << 12), + MN_MP_MAIN + (MN_MP_SPLITSCREEN << 6) + (MN_MP_PLAYERSETUP << 12), #else - MM_MP_MAIN + (MM_MP_PLAYERSETUP << 6), + MN_MP_MAIN + (MN_MP_PLAYERSETUP << 6), #endif "M_SPLAYR", sizeof (MP_PlayerSetupMenu)/sizeof (menuitem_t), @@ -1824,32 +1824,32 @@ menu_t MP_PlayerSetupDef = // Options menu_t OP_MainDef = DEFAULTMENUSTYLE( - MM_OP_MAIN, + MN_OP_MAIN, "M_OPTTTL", OP_MainMenu, &MainDef, 50, 30); menu_t OP_ChangeControlsDef = CONTROLMENUSTYLE( - MM_OP_MAIN + (MM_OP_CHANGECONTROLS << 12), // second level (<<6) set on runtime + MN_OP_MAIN + (MN_OP_CHANGECONTROLS << 12), // second level (<<6) set on runtime OP_ChangeControlsMenu, &OP_MainDef); menu_t OP_P1ControlsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_P1CONTROLS << 6), + MN_OP_MAIN + (MN_OP_P1CONTROLS << 6), "M_CONTRO", OP_P1ControlsMenu, &OP_MainDef, 50, 30); menu_t OP_P2ControlsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_P2CONTROLS << 6), + MN_OP_MAIN + (MN_OP_P2CONTROLS << 6), "M_CONTRO", OP_P2ControlsMenu, &OP_MainDef, 50, 30); menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_P1CONTROLS << 6) + (MM_OP_P1MOUSE << 12), + MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1MOUSE << 12), "M_CONTRO", OP_MouseOptionsMenu, &OP_P1ControlsDef, 35, 30); menu_t OP_Mouse2OptionsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_P2CONTROLS << 6) + (MM_OP_P2MOUSE << 12), + MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2MOUSE << 12), "M_CONTRO", OP_Mouse2OptionsMenu, &OP_P2ControlsDef, 35, 30); menu_t OP_Joystick1Def = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_P1CONTROLS << 6) + (MM_OP_P1JOYSTICK << 12), + MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1JOYSTICK << 12), "M_CONTRO", OP_Joystick1Menu, &OP_P1ControlsDef, 50, 30); menu_t OP_Joystick2Def = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_P2CONTROLS << 6) + (MM_OP_P2JOYSTICK << 12), + MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2JOYSTICK << 12), "M_CONTRO", OP_Joystick2Menu, &OP_P2ControlsDef, 50, 30); menu_t OP_JoystickSetDef = { - MM_OP_MAIN + (MM_OP_JOYSTICKSET << 12), // second level (<<6) set on runtime + MN_OP_MAIN + (MN_OP_JOYSTICKSET << 12), // second level (<<6) set on runtime "M_CONTRO", sizeof (OP_JoystickSetMenu)/sizeof (menuitem_t), &OP_Joystick1Def, @@ -1862,7 +1862,7 @@ menu_t OP_JoystickSetDef = menu_t OP_VideoOptionsDef = { - MM_OP_MAIN + (MM_OP_VIDEO << 6), + MN_OP_MAIN + (MN_OP_VIDEO << 6), "M_VIDEO", sizeof (OP_VideoOptionsMenu)/sizeof (menuitem_t), &OP_MainDef, @@ -1874,7 +1874,7 @@ menu_t OP_VideoOptionsDef = }; menu_t OP_VideoModeDef = { - MM_OP_MAIN + (MM_OP_VIDEO << 6) + (MM_OP_VIDEOMODE << 12), + MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_VIDEOMODE << 12), "M_VIDEO", 1, &OP_VideoOptionsDef, @@ -1886,7 +1886,7 @@ menu_t OP_VideoModeDef = }; menu_t OP_ColorOptionsDef = { - MM_OP_MAIN + (MM_OP_VIDEO << 6) + (MM_OP_COLOR << 12), + MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_COLOR << 12), "M_VIDEO", sizeof (OP_ColorOptionsMenu)/sizeof (menuitem_t), &OP_VideoOptionsDef, @@ -1898,7 +1898,7 @@ menu_t OP_ColorOptionsDef = }; menu_t OP_SoundOptionsDef = { - MM_OP_MAIN + (MM_OP_SOUND << 6), + MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", sizeof (OP_SoundOptionsMenu)/sizeof (menuitem_t), &OP_MainDef, @@ -1910,12 +1910,12 @@ menu_t OP_SoundOptionsDef = }; menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE( - MM_OP_MAIN + (MM_OP_SERVER << 6), + MN_OP_MAIN + (MN_OP_SERVER << 6), "M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 30, 30); menu_t OP_MonitorToggleDef = { - MM_OP_MAIN + (MM_OP_SERVER << 6) + (MM_OP_MONITORTOGGLE << 12), + MN_OP_MAIN + (MN_OP_SERVER << 6) + (MN_OP_MONITORTOGGLE << 12), "M_SERVER", sizeof (OP_MonitorToggleMenu)/sizeof (menuitem_t), &OP_ServerOptionsDef, @@ -1928,16 +1928,16 @@ menu_t OP_MonitorToggleDef = #ifdef HWRENDER menu_t OP_OpenGLOptionsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_VIDEO << 6) + (MM_OP_OPENGL << 12), + MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12), "M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30); #ifdef ALAM_LIGHTING menu_t OP_OpenGLLightingDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_VIDEO << 6) + (MM_OP_OPENGL << 12) + (MM_OP_OPENGL_LIGHTING << 18), + MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12) + (MN_OP_OPENGL_LIGHTING << 18), "M_VIDEO", OP_OpenGLLightingMenu, &OP_OpenGLOptionsDef, 60, 40); #endif menu_t OP_OpenGLFogDef = { - MM_OP_MAIN + (MM_OP_VIDEO << 6) + (MM_OP_OPENGL << 12) + (MM_OP_OPENGL_FOG << 18), + MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12) + (MN_OP_OPENGL_FOG << 18), "M_VIDEO", sizeof (OP_OpenGLFogMenu)/sizeof (menuitem_t), &OP_OpenGLOptionsDef, @@ -1949,7 +1949,7 @@ menu_t OP_OpenGLFogDef = }; menu_t OP_OpenGLColorDef = { - MM_OP_MAIN + (MM_OP_VIDEO << 6) + (MM_OP_OPENGL << 12) + (MM_OP_OPENGL_COLOR << 18), + MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12) + (MN_OP_OPENGL_COLOR << 18), "M_VIDEO", sizeof (OP_OpenGLColorMenu)/sizeof (menuitem_t), &OP_OpenGLOptionsDef, @@ -1961,12 +1961,12 @@ menu_t OP_OpenGLColorDef = }; #endif menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_DATA << 6), + MN_OP_MAIN + (MN_OP_DATA << 6), "M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30); menu_t OP_ScreenshotOptionsDef = { - MM_OP_MAIN + (MM_OP_DATA << 6) + (MM_OP_SCREENSHOTS << 12), + MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_SCREENSHOTS << 12), "M_DATA", sizeof (OP_ScreenshotOptionsMenu)/sizeof (menuitem_t), &OP_DataOptionsDef, @@ -1978,11 +1978,11 @@ menu_t OP_ScreenshotOptionsDef = }; menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_DATA << 6) + (MM_OP_ADDONS << 12), + MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_ADDONS << 12), "M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30); menu_t OP_EraseDataDef = DEFAULTMENUSTYLE( - MM_OP_MAIN + (MM_OP_DATA << 6) + (MM_OP_ERASEDATA << 12), + MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_ERASEDATA << 12), "M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 60, 30); // ========================================================================== @@ -4589,7 +4589,7 @@ static menuitem_t MessageMenu[] = menu_t MessageDef = { - MM_SPECIAL, + MN_SPECIAL, NULL, // title 1, // # of menu items NULL, // previous menu (TO HACK) diff --git a/src/m_menu.h b/src/m_menu.h index 2c35dbf83..300697104 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -26,95 +26,95 @@ // Menu IDs sectioned by numeric places to signify hierarchy typedef enum { - MM_NONE, + MN_NONE, - MM_MAIN, + MN_MAIN, // Single Player - MM_SP_MAIN, + MN_SP_MAIN, - MM_SP_LOAD, - MM_SP_PLAYER, + MN_SP_LOAD, + MN_SP_PLAYER, - MM_SP_LEVELSELECT, - MM_SP_LEVELSTATS, + MN_SP_LEVELSELECT, + MN_SP_LEVELSTATS, - MM_SP_TIMEATTACK, - MM_SP_TIMEATTACK_LEVELSELECT, - MM_SP_GUESTREPLAY, - MM_SP_REPLAY, - MM_SP_GHOST, + MN_SP_TIMEATTACK, + MN_SP_TIMEATTACK_LEVELSELECT, + MN_SP_GUESTREPLAY, + MN_SP_REPLAY, + MN_SP_GHOST, - MM_SP_NIGHTSATTACK, - MM_SP_NIGHTS_LEVELSELECT, - MM_SP_NIGHTS_GUESTREPLAY, - MM_SP_NIGHTS_REPLAY, - MM_SP_NIGHTS_GHOST, + MN_SP_NIGHTSATTACK, + MN_SP_NIGHTS_LEVELSELECT, + MN_SP_NIGHTS_GUESTREPLAY, + MN_SP_NIGHTS_REPLAY, + MN_SP_NIGHTS_GHOST, // Multiplayer - MM_MP_MAIN, - MM_MP_SPLITSCREEN, // SplitServer - MM_MP_SERVER, - MM_MP_CONNECT, - MM_MP_ROOM, - MM_MP_PLAYERSETUP, // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET + MN_MP_MAIN, + MN_MP_SPLITSCREEN, // SplitServer + MN_MP_SERVER, + MN_MP_CONNECT, + MN_MP_ROOM, + MN_MP_PLAYERSETUP, // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET // Options - MM_OP_MAIN, + MN_OP_MAIN, - MM_OP_P1CONTROLS, - MM_OP_CHANGECONTROLS, // OP_ChangeControlsDef shared with P2 - MM_OP_P1MOUSE, - MM_OP_P1JOYSTICK, - MM_OP_JOYSTICKSET, // OP_JoystickSetDef shared with P2 + MN_OP_P1CONTROLS, + MN_OP_CHANGECONTROLS, // OP_ChangeControlsDef shared with P2 + MN_OP_P1MOUSE, + MN_OP_P1JOYSTICK, + MN_OP_JOYSTICKSET, // OP_JoystickSetDef shared with P2 - MM_OP_P2CONTROLS, - MM_OP_P2MOUSE, - MM_OP_P2JOYSTICK, + MN_OP_P2CONTROLS, + MN_OP_P2MOUSE, + MN_OP_P2JOYSTICK, - MM_OP_VIDEO, - MM_OP_VIDEOMODE, - MM_OP_COLOR, - MM_OP_OPENGL, - MM_OP_OPENGL_LIGHTING, - MM_OP_OPENGL_FOG, - MM_OP_OPENGL_COLOR, + MN_OP_VIDEO, + MN_OP_VIDEOMODE, + MN_OP_COLOR, + MN_OP_OPENGL, + MN_OP_OPENGL_LIGHTING, + MN_OP_OPENGL_FOG, + MN_OP_OPENGL_COLOR, - MM_OP_SOUND, + MN_OP_SOUND, - MM_OP_SERVER, - MM_OP_MONITORTOGGLE, + MN_OP_SERVER, + MN_OP_MONITORTOGGLE, - MM_OP_DATA, - MM_OP_ADDONS, - MM_OP_SCREENSHOTS, - MM_OP_ERASEDATA, + MN_OP_DATA, + MN_OP_ADDONS, + MN_OP_SCREENSHOTS, + MN_OP_ERASEDATA, // Secrets - MM_SR_MAIN, - MM_SR_PANDORA, - MM_SR_LEVELSELECT, - MM_SR_UNLOCKCHECKLIST, - MM_SR_EMBLEMHINT, + MN_SR_MAIN, + MN_SR_PANDORA, + MN_SR_LEVELSELECT, + MN_SR_UNLOCKCHECKLIST, + MN_SR_EMBLEMHINT, // Addons (Part of MISC, but let's make it our own) - MM_AD_MAIN, + MN_AD_MAIN, // MISC - // MM_MESSAGE, - // MM_SPAUSE, + // MN_MESSAGE, + // MN_SPAUSE, - // MM_MPAUSE, - // MM_SCRAMBLETEAM, - // MM_CHANGETEAM, - // MM_CHANGELEVEL, + // MN_MPAUSE, + // MN_SCRAMBLETEAM, + // MN_CHANGETEAM, + // MN_CHANGELEVEL, - // MM_MAPAUSE, - // MM_HELP, + // MN_MAPAUSE, + // MN_HELP, - MM_SPECIAL, + MN_SPECIAL, NUMMENUTYPES, -} menutype_t; // up to 63; MM_SPECIAL = 53 +} menutype_t; // up to 63; MN_SPECIAL = 53 // Called by main loop, @@ -381,7 +381,7 @@ void Addons_option_Onchange(void); #define PAUSEMENUSTYLE(source, x, y)\ {\ - MM_SPECIAL,\ + MN_SPECIAL,\ NULL,\ sizeof(source)/sizeof(menuitem_t),\ NULL,\ @@ -433,7 +433,7 @@ void Addons_option_Onchange(void); #define IMAGEDEF(source)\ {\ - MM_SPECIAL,\ + MN_SPECIAL,\ NULL,\ sizeof (source)/sizeof (menuitem_t),\ NULL,\