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

Menu functions now return INT32

Browse source 
Just my best guess what everything should return. Doesn't matter right now
This commit is contained in:
GenericHeroGuy 2025-06-05 16:51:47 +02:00
parent 8288eaf733
commit 5a0a889cd1
10 changed files with 416 additions and 325 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_netcmd.c
View file

@ -3386,7 +3386,7 @@ static void Command_Pause(void)
}
else if (modeattacking) // in time attack, pausing restarts the map
{
M_ModeAttackRetry(0); // directly call from m_menu;
MR_ModeAttackRetry(0); // directly call from m_menu;
return;
}

12
src/deh_soc.c
View file

@ -2023,7 +2023,7 @@ static void readmenuitem(MYFILE *f, menuitem_t *menuitem)
WARN0("action already set!");
continue;
}
void (*routine)(INT32) = get_menuroutine(word2);
menufunc_f *routine = get_menuroutine(word2);
if (!routine)
{
WARN("unknown call routine '%s'", word2);
@ -2263,7 +2263,7 @@ void readmenu(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "DRAWROUTINE"))
{
void (*drawer)(void) = get_menudrawer(word2);
menudrawer_f *drawer = get_menudrawer(word2);
if (drawer == NULL)
{
WARN("unknown draw routine '%s'", word2);
@ -2281,7 +2281,7 @@ void readmenu(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "ENTERROUTINE"))
{
void (*routine)(INT32) = get_menuroutine(word2);
menufunc_f *routine = get_menuroutine(word2);
if (!routine)
{
WARN("unknown enter routine '%s'", word2);
@ -2291,7 +2291,7 @@ void readmenu(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "QUITROUTINE"))
{
void (*routine)(INT32) = get_menuroutine(word2);
menufunc_f *routine = get_menuroutine(word2);
if (!routine)
{
WARN("unknown quit routine '%s'", word2);
@ -4034,7 +4034,7 @@ menutype_t get_menutype(const char *word)
return i;
}
void (*get_menuroutine(const char *word))(INT32)
menufunc_f *get_menuroutine(const char *word)
{ // Returns the value of MR_ enumerations
size_t i;
if (fastncmp("MR_",word,3))
@ -4046,7 +4046,7 @@ void (*get_menuroutine(const char *word))(INT32)
return NULL;
}
void (*get_menudrawer(const char *word))(void)
menudrawer_f *get_menudrawer(const char *word)
{ // Returns the value of MD_ enumerations
size_t i;
if (fastncmp("MD_",word,3))

4
src/deh_soc.h
View file

@ -57,8 +57,8 @@ spritenum_t get_sprite(const char *word);
playersprite_t get_sprite2(const char *word);
sfxenum_t get_sfx(const char *word);
menutype_t get_menutype(const char *word);
void (*get_menuroutine(const char *word))(INT32);
void (*get_menudrawer(const char *word))(void);
menufunc_f *get_menuroutine(const char *word);
menudrawer_f *get_menudrawer(const char *word);
//INT16 get_gametype(const char *word);
//powertype_t get_power(const char *word);
skincolornum_t get_skincolor(const char *word);

148
src/deh_tables.c
View file

@ -674,83 +674,83 @@ const char *const HUDITEMS_LIST[] = {
};
struct menu_routine_s const MENU_ROUTINES[] = {
{ "SINGLEPLAYERMENU", &M_SinglePlayerMenu },
{ "OPTIONS", &M_Options },
{ "ADDONS", &M_Addons },
{ "QUITSRB2", &M_QuitSRB2 },
{ "STATISTICS", &M_Statistics },
{ "HANDLELEVELSTATS", &M_HandleLevelStats },
{ "REPLAYHUT", &M_ReplayHut },
{ "QUITREPLAYHUT", &M_QuitReplayHut },
{ "HANDLEREPLAYHUTLIST", &M_HandleReplayHutList },
{ "GRANDPRIXTEMP", &M_GrandPrixTemp },
{ "TIMEATTACK", &M_TimeAttack },
{ "STARTGRANDPRIX", &M_StartGrandPrix },
{ "QUITTIMEATTACKMENU", &M_QuitTimeAttackMenu },
{ "CHOOSETIMEATTACK", &M_ChooseTimeAttack },
{ "SETGUESTREPLAY", &M_SetGuestReplay },
{ "REPLAYTIMEATTACK", &M_ReplayTimeAttack },
{ "TIMEATTACKPRESET", &M_TimeAttackPreset },
{ "HANDLESTAFFREPLAY", &M_HandleStaffReplay },
{ "SETUPMULTIHANDLER", &M_SetupMultiHandler },
{ "HANDLESETUPMULTIPLAYER", &M_HandleSetupMultiPlayer },
{ "QUITMULTIPLAYERMENU", &M_QuitMultiPlayerMenu },
{ "STARTSERVERMENU", &M_StartServerMenu },
{ "STARTOFFLINESERVERMENU", &M_StartOfflineServerMenu },
{ "STARTSERVER", &M_StartServer },
{ "CONNECTMENUMODCHECKS", &M_ConnectMenuModChecks },
{ "HANDLECONNECTIP", &M_HandleConnectIP },
{ "CANCELCONNECT", &M_CancelConnect },
{ "SETUPCONTROLSMENU", &M_SetupControlsMenu },
{ "HANDLESERVERPAGE", &M_HandleServerPage },
{ "REFRESH", &M_Refresh },
{ "CONNECT", &M_Connect },
{ "VIDEOMODEMENU", &M_VideoModeMenu },
{ "SINGLEPLAYERMENU", &MR_SinglePlayerMenu },
{ "OPTIONS", &MR_Options },
{ "ADDONS", &MR_Addons },
{ "QUITSRB2", &MR_QuitSRB2 },
{ "STATISTICS", &MR_Statistics },
{ "HANDLELEVELSTATS", &MR_HandleLevelStats },
{ "REPLAYHUT", &MR_ReplayHut },
{ "QUITREPLAYHUT", &MR_QuitReplayHut },
{ "HANDLEREPLAYHUTLIST", &MR_HandleReplayHutList },
{ "GRANDPRIXTEMP", &MR_GrandPrixTemp },
{ "TIMEATTACK", &MR_TimeAttack },
{ "STARTGRANDPRIX", &MR_StartGrandPrix },
{ "QUITTIMEATTACKMENU", &MR_QuitTimeAttackMenu },
{ "CHOOSETIMEATTACK", &MR_ChooseTimeAttack },
{ "SETGUESTREPLAY", &MR_SetGuestReplay },
{ "REPLAYTIMEATTACK", &MR_ReplayTimeAttack },
{ "TIMEATTACKPRESET", &MR_TimeAttackPreset },
{ "HANDLESTAFFREPLAY", &MR_HandleStaffReplay },
{ "SETUPMULTIHANDLER", &MR_SetupMultiHandler },
{ "HANDLESETUPMULTIPLAYER", &MR_HandleSetupMultiPlayer },
{ "QUITMULTIPLAYERMENU", &MR_QuitMultiPlayerMenu },
{ "STARTSERVERMENU", &MR_StartServerMenu },
{ "STARTOFFLINESERVERMENU", &MR_StartOfflineServerMenu },
{ "STARTSERVER", &MR_StartServer },
{ "CONNECTMENUMODCHECKS", &MR_ConnectMenuModChecks },
{ "HANDLECONNECTIP", &MR_HandleConnectIP },
{ "CANCELCONNECT", &MR_CancelConnect },
{ "SETUPCONTROLSMENU", &MR_SetupControlsMenu },
{ "HANDLESERVERPAGE", &MR_HandleServerPage },
{ "REFRESH", &MR_Refresh },
{ "CONNECT", &MR_Connect },
{ "VIDEOMODEMENU", &MR_VideoModeMenu },
#ifdef HWRENDER
{ "OPENGLOPTIONSMENU", &M_OpenGLOptionsMenu },
{ "OPENGLOPTIONSMENU", &MR_OpenGLOptionsMenu },
#endif
{ "HANDLEVIDEOMODE", &M_HandleVideoMode },
{ "HANDLESOUNDTEST", &M_HandleSoundTest },
{ "MUSICTEST", &M_MusicTest },
{ "SCREENSHOTOPTIONS", &M_ScreenshotOptions },
{ "ADDONSOPTIONS", &M_AddonsOptions },
{ "ERASEDATA", &M_EraseData },
{ "MANUAL", &M_Manual },
{ "CREDITS", &M_Credits },
{ "BLANCREDITS", &M_BlanCredits },
{ "HANDLEADDONS", &M_HandleAddons },
{ "SELECTABLECLEARMENUS", &M_SelectableClearMenus },
{ "MODEATTACKRETRY", &M_ModeAttackRetry },
{ "MODEATTACKENDGAME", &M_ModeAttackEndGame },
{ "RETRY", &M_Retry },
{ "ENDGAME", &M_EndGame },
{ "MAPCHANGE", &M_MapChange },
{ "SETUPMULTIPLAYER", &M_SetupMultiPlayer },
{ "CONFIRMSPECTATE", &M_ConfirmSpectate },
{ "CONFIRMENTERGAME", &M_ConfirmEnterGame },
{ "CONFIRMTEAMSCRAMBLE", &M_ConfirmTeamScramble },
{ "CONFIRMTEAMCHANGE", &M_ConfirmTeamChange },
{ "CONFIRMSPECTATECHANGE", &M_ConfirmSpectateChange },
{ "CHANGELEVEL", &M_ChangeLevel },
{ "HUTSTARTREPLAY", &M_HutStartReplay },
{ "PLAYBACKREWIND", &M_PlaybackRewind },
{ "PLAYBACKPAUSE", &M_PlaybackPause },
{ "PLAYBACKFASTFORWARD", &M_PlaybackFastForward },
{ "PLAYBACKADVANCE", &M_PlaybackAdvance },
{ "PLAYBACKSETVIEWS", &M_PlaybackSetViews },
{ "PLAYBACKADJUSTVIEW", &M_PlaybackAdjustView },
{ "PLAYBACKTOGGLEFREECAM", &M_PlaybackToggleFreecam },
{ "PLAYBACKQUIT", &M_PlaybackQuit },
{ "HANDLEIMAGEDEF", &M_HandleImageDef },
{ "HANDLEMUSICTEST", &M_HandleMusicTest },
{ "SETUPJOYSTICKMENU", &M_SetupJoystickMenu },
{ "RESETCONTROLS", &M_ResetControls },
{ "CHANGECONTROL", &M_ChangeControl },
{ "ASSIGNJOYSTICK", &M_AssignJoystick },
{ "HANDLEMONITORTOGGLES", &M_HandleMonitorToggles },
{ "RESTARTAUDIO", &M_RestartAudio },
{ "HANDLEVIDEOMODE", &MR_HandleVideoMode },
{ "HANDLESOUNDTEST", &MR_HandleSoundTest },
{ "MUSICTEST", &MR_MusicTest },
{ "SCREENSHOTOPTIONS", &MR_ScreenshotOptions },
{ "ADDONSOPTIONS", &MR_AddonsOptions },
{ "ERASEDATA", &MR_EraseData },
{ "MANUAL", &MR_Manual },
{ "CREDITS", &MR_Credits },
{ "BLANCREDITS", &MR_BlanCredits },
{ "HANDLEADDONS", &MR_HandleAddons },
{ "SELECTABLECLEARMENUS", &MR_SelectableClearMenus },
{ "MODEATTACKRETRY", &MR_ModeAttackRetry },
{ "MODEATTACKENDGAME", &MR_ModeAttackEndGame },
{ "RETRY", &MR_Retry },
{ "ENDGAME", &MR_EndGame },
{ "MAPCHANGE", &MR_MapChange },
{ "SETUPMULTIPLAYER", &MR_SetupMultiPlayer },
{ "CONFIRMSPECTATE", &MR_ConfirmSpectate },
{ "CONFIRMENTERGAME", &MR_ConfirmEnterGame },
{ "CONFIRMTEAMSCRAMBLE", &MR_ConfirmTeamScramble },
{ "CONFIRMTEAMCHANGE", &MR_ConfirmTeamChange },
{ "CONFIRMSPECTATECHANGE", &MR_ConfirmSpectateChange },
{ "CHANGELEVEL", &MR_ChangeLevel },
{ "HUTSTARTREPLAY", &MR_HutStartReplay },
{ "PLAYBACKREWIND", &MR_PlaybackRewind },
{ "PLAYBACKPAUSE", &MR_PlaybackPause },
{ "PLAYBACKFASTFORWARD", &MR_PlaybackFastForward },
{ "PLAYBACKADVANCE", &MR_PlaybackAdvance },
{ "PLAYBACKSETVIEWS", &MR_PlaybackSetViews },
{ "PLAYBACKADJUSTVIEW", &MR_PlaybackAdjustView },
{ "PLAYBACKTOGGLEFREECAM", &MR_PlaybackToggleFreecam },
{ "PLAYBACKQUIT", &MR_PlaybackQuit },
{ "HANDLEIMAGEDEF", &MR_HandleImageDef },
{ "HANDLEMUSICTEST", &MR_HandleMusicTest },
{ "SETUPJOYSTICKMENU", &MR_SetupJoystickMenu },
{ "RESETCONTROLS", &MR_ResetControls },
{ "CHANGECONTROL", &MR_ChangeControl },
{ "ASSIGNJOYSTICK", &MR_AssignJoystick },
{ "HANDLEMONITORTOGGLES", &MR_HandleMonitorToggles },
{ "RESTARTAUDIO", &MR_RestartAudio },
#ifdef HAVE_DISCORDRPC
{ "HANDLEDISCORDREQUESTS", &M_HandleDiscordRequests },
{ "HANDLEDISCORDREQUESTS", &MR_HandleDiscordRequests },
#endif
{ NULL, NULL }
};

4
src/deh_tables.h
View file

@ -59,12 +59,12 @@ struct actionpointer_t
struct menu_routine_s {
const char *name;
void (*routine)(INT32);
menufunc_f *routine;
};
struct menu_drawer_s {
const char *name;
void (*drawer)(void);
menudrawer_f *drawer;
};
struct int_const_s {

2
src/g_demo.c
View file

@ -4026,7 +4026,7 @@ boolean G_CheckDemoStatus(void)
if (timedemo_quit)
COM_ImmedExecute("quit");
else if (modeattacking)
M_ModeAttackEndGame(0);
MR_ModeAttackEndGame(0);
else
D_StartTitle();
}

6
src/g_game.c
View file

@ -702,7 +702,7 @@ void G_SetGameModified(boolean silent, boolean major)
// If in record attack recording, cancel it.
if (modeattacking)
M_ModeAttackEndGame(0);
MR_ModeAttackEndGame(0);
else if (marathonmode)
Command_ExitGame_f();
}
@ -4299,7 +4299,7 @@ void G_AfterIntermission(void)
G_StopDemo();
if (demo.inreplayhut)
M_ReplayHut(0);
MR_ReplayHut(0);
else
D_StartTitle();
@ -4310,7 +4310,7 @@ void G_AfterIntermission(void)
if (modeattacking) // End the run.
{
M_ModeAttackEndGame(0);
MR_ModeAttackEndGame(0);
return;
}

388
src/m_menu.c
View file

File diff suppressed because it is too large Load diff

171
src/m_menu.h
View file

@ -122,7 +122,7 @@ void M_SortServerList(void);
void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines);
// Used in d_netcmd to restart time attack
void M_ModeAttackRetry(INT32 choice);
INT32 MR_ModeAttackRetry(INT32 choice);
// the function to show a message box typing with the string inside
// string must be static (not in the stack)
@ -194,11 +194,14 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt);
#define MAXSTRINGLENGTH 32
typedef INT32 (menufunc_f)(INT32);
typedef void (menudrawer_f)(void);
typedef union
{
menutype_t submenu; // IT_SUBMENU
consvar_t *cvar; // IT_CVAR
void (*routine)(INT32 choice); // IT_CALL, IT_KEYHANDLER, IT_ARROWS
menutype_t submenu; // IT_SUBMENU
consvar_t *cvar; // IT_CVAR
menufunc_f *routine; // IT_CALL, IT_KEYHANDLER, IT_ARROWS
} itemaction_t;
//
@ -227,11 +230,11 @@ struct menu_t
const char *headerpic;
INT16 numitems; // # of menu items
menuitem_t *menuitems; // menu items
void (*drawroutine)(void); // draw routine
menudrawer_f *drawroutine; // draw routine
INT16 x, y; // x, y of menu
INT16 lastOn; // last item user was on in menu
void (*enterroutine)(INT32 choice); // called before enter a menu
void (*quitroutine)(INT32 choice); // called before quit a menu
menufunc_f *enterroutine; // called before enter a menu
menufunc_f *quitroutine; // called before quit a menu
};
extern menu_t menudefs[MAXMENUTYPES];
@ -243,80 +246,80 @@ void M_ClearMenus(boolean callexitmenufunc);
menuitem_t *M_CheckMenuItem(menutype_t type, const char *name);
menuitem_t *M_GetMenuItem(menutype_t type, const char *name);
void M_SinglePlayerMenu(INT32 choice);
void M_Options(INT32 choice);
void M_Addons(INT32 choice);
void M_QuitSRB2(INT32 choice);
void M_Statistics(INT32 choice);
void M_HandleLevelStats(INT32 choice);
void M_QuitReplayHut(INT32 choice);
void M_HandleReplayHutList(INT32 choice);
void M_GrandPrixTemp(INT32 choice);
void M_TimeAttack(INT32 arg);
void M_StartGrandPrix(INT32 choice);
void M_QuitTimeAttackMenu(INT32 choice);
void M_ChooseTimeAttack(INT32 choice);
void M_SetGuestReplay(INT32 arg);
void M_TimeAttackPreset(INT32 arg);
void M_ReplayTimeAttack(INT32 arg);
void M_HandleStaffReplay(INT32 choice);
void M_SetupMultiHandler(INT32 choice);
void M_HandleSetupMultiPlayer(INT32 choice);
void M_QuitMultiPlayerMenu(INT32 choice);
void M_StartServerMenu(INT32 choice);
void M_StartOfflineServerMenu(INT32 choice);
void M_StartServer(INT32 choice);
void M_ConnectMenuModChecks(INT32 choice);
void M_HandleConnectIP(INT32 choice);
void M_CancelConnect(INT32 choice);
void M_SetupControlsMenu(INT32 arg);
void M_HandleServerPage(INT32 choice);
void M_Refresh(INT32 choice);
void M_Connect(INT32 arg);
void M_VideoModeMenu(INT32 choice);
INT32 MR_SinglePlayerMenu(INT32 choice);
INT32 MR_Options(INT32 choice);
INT32 MR_Addons(INT32 choice);
INT32 MR_QuitSRB2(INT32 choice);
INT32 MR_Statistics(INT32 choice);
INT32 MR_HandleLevelStats(INT32 choice);
INT32 MR_QuitReplayHut(INT32 choice);
INT32 MR_HandleReplayHutList(INT32 choice);
INT32 MR_GrandPrixTemp(INT32 choice);
INT32 MR_TimeAttack(INT32 arg);
INT32 MR_StartGrandPrix(INT32 choice);
INT32 MR_QuitTimeAttackMenu(INT32 choice);
INT32 MR_ChooseTimeAttack(INT32 choice);
INT32 MR_SetGuestReplay(INT32 arg);
INT32 MR_TimeAttackPreset(INT32 arg);
INT32 MR_ReplayTimeAttack(INT32 arg);
INT32 MR_HandleStaffReplay(INT32 choice);
INT32 MR_SetupMultiHandler(INT32 choice);
INT32 MR_HandleSetupMultiPlayer(INT32 choice);
INT32 MR_QuitMultiPlayerMenu(INT32 choice);
INT32 MR_StartServerMenu(INT32 choice);
INT32 MR_StartOfflineServerMenu(INT32 choice);
INT32 MR_StartServer(INT32 choice);
INT32 MR_ConnectMenuModChecks(INT32 choice);
INT32 MR_HandleConnectIP(INT32 choice);
INT32 MR_CancelConnect(INT32 choice);
INT32 MR_SetupControlsMenu(INT32 arg);
INT32 MR_HandleServerPage(INT32 choice);
INT32 MR_Refresh(INT32 choice);
INT32 MR_Connect(INT32 arg);
INT32 MR_VideoModeMenu(INT32 choice);
#ifdef HWRENDER
void M_OpenGLOptionsMenu(INT32 choice);
INT32 MR_OpenGLOptionsMenu(INT32 choice);
#endif
void M_HandleVideoMode(INT32 ch);
void M_HandleSoundTest(INT32 choice);
void M_MusicTest(INT32 choice);
void M_ScreenshotOptions(INT32 choice);
void M_AddonsOptions(INT32 choice);
void M_EraseData(INT32 arg);
void M_Manual(INT32 choice);
void M_Credits(INT32 choice);
void M_BlanCredits(INT32 choice);
void M_HandleAddons(INT32 choice);
void M_SelectableClearMenus(INT32 choice);
void M_ModeAttackEndGame(INT32 choice);
void M_Retry(INT32 choice);
void M_EndGame(INT32 choice);
void M_MapChange(INT32 choice);
void M_SetupMultiPlayer(INT32 choice);
void M_ConfirmSpectate(INT32 choice);
void M_ConfirmEnterGame(INT32 choice);
void M_ConfirmTeamScramble(INT32 choice);
void M_ConfirmTeamChange(INT32 choice);
void M_ConfirmSpectateChange(INT32 choice);
void M_ChangeLevel(INT32 choice);
void M_HutStartReplay(INT32 choice);
void M_PlaybackRewind(INT32 choice);
void M_PlaybackPause(INT32 choice);
void M_PlaybackFastForward(INT32 choice);
void M_PlaybackAdvance(INT32 choice);
void M_PlaybackSetViews(INT32 choice);
void M_PlaybackAdjustView(INT32 choice);
void M_PlaybackToggleFreecam(INT32 choice);
void M_PlaybackQuit(INT32 choice);
void M_HandleImageDef(INT32 choice);
void M_HandleMusicTest(INT32 choice);
void M_ResetControls(INT32 choice);
void M_ChangeControl(INT32 arg);
void M_AssignJoystick(INT32 arg);
void M_HandleMonitorToggles(INT32 choice);
void M_RestartAudio(INT32 choice);
INT32 MR_HandleVideoMode(INT32 ch);
INT32 MR_HandleSoundTest(INT32 choice);
INT32 MR_MusicTest(INT32 choice);
INT32 MR_ScreenshotOptions(INT32 choice);
INT32 MR_AddonsOptions(INT32 choice);
INT32 MR_EraseData(INT32 arg);
INT32 MR_Manual(INT32 choice);
INT32 MR_Credits(INT32 choice);
INT32 MR_BlanCredits(INT32 choice);
INT32 MR_HandleAddons(INT32 choice);
INT32 MR_SelectableClearMenus(INT32 choice);
INT32 MR_ModeAttackEndGame(INT32 choice);
INT32 MR_Retry(INT32 choice);
INT32 MR_EndGame(INT32 choice);
INT32 MR_MapChange(INT32 choice);
INT32 MR_SetupMultiPlayer(INT32 choice);
INT32 MR_ConfirmSpectate(INT32 choice);
INT32 MR_ConfirmEnterGame(INT32 choice);
INT32 MR_ConfirmTeamScramble(INT32 choice);
INT32 MR_ConfirmTeamChange(INT32 choice);
INT32 MR_ConfirmSpectateChange(INT32 choice);
INT32 MR_ChangeLevel(INT32 choice);
INT32 MR_HutStartReplay(INT32 choice);
INT32 MR_PlaybackRewind(INT32 choice);
INT32 MR_PlaybackPause(INT32 choice);
INT32 MR_PlaybackFastForward(INT32 choice);
INT32 MR_PlaybackAdvance(INT32 choice);
INT32 MR_PlaybackSetViews(INT32 choice);
INT32 MR_PlaybackAdjustView(INT32 choice);
INT32 MR_PlaybackToggleFreecam(INT32 choice);
INT32 MR_PlaybackQuit(INT32 choice);
INT32 MR_HandleImageDef(INT32 choice);
INT32 MR_HandleMusicTest(INT32 choice);
INT32 MR_ResetControls(INT32 choice);
INT32 MR_ChangeControl(INT32 arg);
INT32 MR_AssignJoystick(INT32 arg);
INT32 MR_HandleMonitorToggles(INT32 choice);
INT32 MR_RestartAudio(INT32 choice);
#ifdef HAVE_DISCORDRPC
void M_HandleDiscordRequests(INT32 choice);
INT32 MR_HandleDiscordRequests(INT32 choice);
#endif
void M_DrawGenericMenu(void);
@ -355,7 +358,7 @@ extern I_mutex m_menu_mutex;
#endif
// Call upon joystick hotplug
void M_SetupJoystickMenu(INT32 arg);
INT32 MR_SetupJoystickMenu(INT32 arg);
// level select platter
typedef struct
@ -425,14 +428,6 @@ extern INT16 char_on, startchar;
#define BwehHehHe() S_StartSound(NULL, sfx_bewar1+M_RandomKey(4)) // Bweh heh he
//void M_TutorialSaveControlResponse(INT32 ch);
void M_ForceSaveSlotSelected(INT32 sslot);
void M_CheatActivationResponder(INT32 ch);
void M_ModeAttackRetry(INT32 choice);
// File name appender for RA gametype+mod reading.
char *M_AppendGametypeAndModName(void);
@ -446,7 +441,7 @@ void Screenshot_option_Onchange(void);
// Addons menu updating
void Addons_option_Onchange(void);
void M_ReplayHut(INT32 choice);
INT32 MR_ReplayHut(INT32 choice);
void M_SetPlaybackMenuPointer(void);
void M_RefreshPauseMenu(void);

4
src/sdl/i_video.cpp
View file

@ -1011,7 +1011,7 @@ void I_GetEvent(void)
// update the menu
if (menustack[0] == MN_OP_JOYSTICKSET)
M_SetupJoystickMenu(0);
MR_SetupJoystickMenu(0);
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{
@ -1071,7 +1071,7 @@ void I_GetEvent(void)
// update the menu
if (menustack[0] == MN_OP_JOYSTICKSET)
M_SetupJoystickMenu(0);
MR_SetupJoystickMenu(0);
break;
case SDL_DROPFILE:
dropped_filedir = evt.drop.file;