Properly fix the spb-profile stat grid bug

This commit is contained in:
luigi budd 2025-07-14 22:55:22 +00:00
parent 3b36812f10
commit 5d9dcd0243
4 changed files with 5 additions and 21 deletions

View file

@ -1167,8 +1167,6 @@ void M_MapProfileControl(event_t *ev);
void M_ProfileTryController(INT32 choice); void M_ProfileTryController(INT32 choice);
void M_ProfileControlsConfirm(INT32 choice); void M_ProfileControlsConfirm(INT32 choice);
boolean M_ProfileQuitHandle(void);
// video modes menu (resolution) // video modes menu (resolution)
void M_HandleVideoModes(INT32 ch); void M_HandleVideoModes(INT32 ch);

View file

@ -932,14 +932,6 @@ void M_ClearMenus(boolean callexitmenufunc)
D_StartTitle(); D_StartTitle();
} }
// this is not a good place to put this i thinkMore actions
if (optionsmenu.profile)
{
M_ResetOptions();
optionsmenu.profile = NULL;
}
M_AbortVirtualKeyboard(); M_AbortVirtualKeyboard();
menumessage.active = false; menumessage.active = false;

View file

@ -52,7 +52,7 @@ menu_t OPTIONS_EditProfileDef = {
M_DrawOptionsCogs, M_DrawOptionsCogs,
M_HandleProfileEdit, M_HandleProfileEdit,
NULL, NULL,
M_ProfileQuitHandle, NULL,
M_ProfileEditInputs, M_ProfileEditInputs,
}; };
@ -238,13 +238,3 @@ void M_ProfileDeviceSelect(INT32 choice)
M_SetupNextMenu(&OPTIONS_ProfileControlsDef, false); // Don't set device here anymore. M_SetupNextMenu(&OPTIONS_ProfileControlsDef, false); // Don't set device here anymore.
} }
boolean M_ProfileQuitHandle(void)
{
if (optionsmenu.profile != NULL)
{
M_ResetOptions(); // Reset all options variables otherwise things are gonna go reaaal bad lol.
optionsmenu.profile = NULL; // Make sure to get rid of that, too.
}
return false;
}

View file

@ -137,6 +137,10 @@ void M_EndModeAttackRun(void)
// Return to the menu. // Return to the menu.
D_ClearState(); D_ClearState();
M_StartControlPanel(); M_StartControlPanel();
// This removes any lingering optionsmenu.profile pointers,
// so that when returning to char select, it will show the normal
// stat grid instead of the profile one (this is also most likely a bad way to fix this)
M_ResetOptions();
} }
// Replay Playback Menu // Replay Playback Menu