incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused SRB2 menutypes

Browse source 
Also remove MP_OFFLINESERVER, since that's just MP_SPLITSCREEN (oops)
This commit is contained in:
GenericHeroGuy 2025-03-24 16:37:41 +01:00
parent a609c7b5ce
commit eb481b6ac4
3 changed files with 3 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/deh_tables.c
View file

@ -617,57 +617,32 @@ const char *const MENUTYPES_LIST[] = {
// Single Player
"SP_MAIN",
"SP_LOAD",
"SP_PLAYER",
"SP_LEVELSELECT",
"SP_LEVELSTATS",
"SP_TIMEATTACK",
"SP_TIMEATTACK_LEVELSELECT",
"SP_GUESTREPLAY",
"SP_REPLAY",
"SP_GHOST",
"SP_NIGHTSATTACK",
"SP_NIGHTS_LEVELSELECT",
"SP_NIGHTS_GUESTREPLAY",
"SP_NIGHTS_REPLAY",
"SP_NIGHTS_GHOST",
"SP_MARATHON",
// Multiplayer
"MP_MAIN",
"MP_SPLITSCREEN", // SplitServer
"MP_SERVER",
"MP_CONNECT",
"MP_ROOM",
"MP_PLAYERSETUP", // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET
"MP_SERVER_OPTIONS",
// Options
"OP_MAIN",
"OP_P1CONTROLS",
"OP_CHANGECONTROLS", // OP_ChangeControlsDef shared with P2
"OP_P1MOUSE",
"OP_P1JOYSTICK",
"OP_JOYSTICKSET", // OP_JoystickSetDef shared with P2
"OP_P1CAMERA",
"OP_P2CONTROLS",
"OP_P2MOUSE",
"OP_P2JOYSTICK",
"OP_P2CAMERA",
"OP_PLAYSTYLE",
"OP_VIDEO",
"OP_VIDEOMODE",
"OP_COLOR",
"OP_OPENGL",
"OP_OPENGL_LIGHTING",
"OP_SOUND",
@ -682,10 +657,8 @@ const char *const MENUTYPES_LIST[] = {
// Extras
"SR_MAIN",
"SR_PANDORA",
"SR_LEVELSELECT",
"SR_UNLOCKCHECKLIST",
"SR_EMBLEMHINT",
"SR_PLAYER",
"SR_SOUNDTEST",
// Addons (Part of MISC, but let's make it our own)
@ -713,7 +686,6 @@ const char *const MENUTYPES_LIST[] = {
"OP_P3CAMERA",
"OP_P4CAMERA",
"MISC_REPLAYOPTIONS",
"MP_OFFLINESERVER",
"SP_GRANDPRIX",
"MISC_REPLAYHUT",
"CHANGESPECTATE",
@ -727,8 +699,6 @@ const char *const MENUTYPES_LIST[] = {
"OP_DISCORD",
"MISC_DISCORDREQUESTS",
#endif
"SPECIAL"
};
struct menu_routine_s const MENU_ROUTINES[] = {

12
src/m_menu.c
View file

@ -755,12 +755,6 @@ void M_InitMenuPresTables(void)
}
if (i == MN_SP_TIMEATTACK)
strncpy(menupres[i].musname, "_recat", 7);
else if (i == MN_SP_NIGHTSATTACK)
strncpy(menupres[i].musname, "_nitat", 7);
else if (i == MN_SP_MARATHON)
strncpy(menupres[i].musname, "spec8", 6);
else if (i == MN_SP_PLAYER || i == MN_SR_PLAYER)
strncpy(menupres[i].musname, "_chsel", 7);
else if (i == MN_SR_SOUNDTEST)
{
*menupres[i].musname = '\0';
@ -6515,7 +6509,7 @@ void M_StartServer(INT32 choice)
(void)choice;
if (menustack[0] == MN_MP_OFFLINESERVER)
if (menustack[0] == MN_MP_SPLITSCREEN)
netgame = false;
else
netgame = true;
@ -6544,7 +6538,7 @@ void M_StartServer(INT32 choice)
SplitScreen_OnChange();
}
if (menustack[0] == MN_MP_OFFLINESERVER) // offline server
if (menustack[0] == MN_MP_SPLITSCREEN) // offline server
{
paused = false;
SV_StartSinglePlayerServer();
@ -6681,7 +6675,7 @@ void M_StartOfflineServerMenu(INT32 choice)
(void)choice;
levellistmode = LLM_CREATESERVER;
M_PrepareLevelSelect();
M_EnterMenu(MN_MP_OFFLINESERVER, true);
M_EnterMenu(MN_MP_SPLITSCREEN, true);
}
void M_StartServerMenu(INT32 choice)

30
src/m_menu.h
View file

@ -50,57 +50,32 @@ typedef enum
// Single Player
MN_SP_MAIN,
MN_SP_LOAD,
MN_SP_PLAYER,
MN_SP_LEVELSELECT,
MN_SP_LEVELSTATS,
MN_SP_TIMEATTACK,
MN_SP_TIMEATTACK_LEVELSELECT,
MN_SP_GUESTREPLAY,
MN_SP_REPLAY,
MN_SP_GHOST,
MN_SP_NIGHTSATTACK,
MN_SP_NIGHTS_LEVELSELECT,
MN_SP_NIGHTS_GUESTREPLAY,
MN_SP_NIGHTS_REPLAY,
MN_SP_NIGHTS_GHOST,
MN_SP_MARATHON,
// Multiplayer
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
MN_MP_SERVER_OPTIONS,
// Options
MN_OP_MAIN,
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
MN_OP_P1CAMERA,
MN_OP_P2CONTROLS,
MN_OP_P2MOUSE,
MN_OP_P2JOYSTICK,
MN_OP_P2CAMERA,
MN_OP_PLAYSTYLE,
MN_OP_VIDEO,
MN_OP_VIDEOMODE,
MN_OP_COLOR,
MN_OP_OPENGL,
MN_OP_OPENGL_LIGHTING,
MN_OP_SOUND,
@ -115,10 +90,8 @@ typedef enum
// Extras
MN_SR_MAIN,
MN_SR_PANDORA,
MN_SR_LEVELSELECT,
MN_SR_UNLOCKCHECKLIST,
MN_SR_EMBLEMHINT,
MN_SR_PLAYER,
MN_SR_SOUNDTEST,
// Addons (Part of MISC, but let's make it our own)
@ -146,7 +119,6 @@ typedef enum
MN_OP_P3CAMERA,
MN_OP_P4CAMERA,
MN_MISC_REPLAYOPTIONS,
MN_MP_OFFLINESERVER,
MN_SP_GRANDPRIX,
MN_MISC_REPLAYHUT,
MN_CHANGESPECTATE,
@ -161,8 +133,6 @@ typedef enum
MN_MISC_DISCORDREQUESTS,
#endif
MN_SPECIAL,
MN_FIRSTFREESLOT,
MN_LASTFREESLOT,
NUMMENUTYPES,