thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M_FirstPickProfile, M_StartControlPanel: Support restoremenu after first profile selection

Browse source
This commit is contained in:
toaster 2023-01-31 13:12:31 +00:00
parent 3ba8ccfbfb
commit 418cc29adc
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_menufunc.c
View file

@ -503,10 +503,9 @@ void M_StartControlPanel(void)
if (restoreMenu == NULL) if (restoreMenu == NULL)
restoreMenu = &MainDef; restoreMenu = &MainDef;
currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu)); currentMenu = M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu));
}
restoreMenu = NULL; restoreMenu = NULL;
} }
}
else else
{ {
M_OpenPauseMenu(); M_OpenPauseMenu();

6
src/menus/options-profiles-1.c
View file

@ -47,7 +47,11 @@ void M_FirstPickProfile(INT32 c)
optionsmenu.profile = NULL; // Make sure to get rid of that, too. optionsmenu.profile = NULL; // Make sure to get rid of that, too.
PR_ApplyProfile(optionsmenu.profilen, 0); PR_ApplyProfile(optionsmenu.profilen, 0);
M_SetupNextMenu(M_InterruptMenuWithChallenges(&MainDef), false);
if (restoreMenu == NULL)
restoreMenu = &MainDef;
M_SetupNextMenu(M_SpecificMenuRestore(M_InterruptMenuWithChallenges(restoreMenu)), false);
restoreMenu = NULL;
// Tell the game this is the last profile we picked. // Tell the game this is the last profile we picked.
CV_StealthSetValue(&cv_ttlprofilen, optionsmenu.profilen); CV_StealthSetValue(&cv_ttlprofilen, optionsmenu.profilen);