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

Merge branch 'music-cleanup' into 'master'

Browse source 
Some M_PlayMenuJam fixes

See merge request kart-krew-dev/ring-racers-internal!2857
This commit is contained in:
Eidolon 2025-09-16 21:37:02 -05:00
commit 055a4f9123
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_menufunc.c
View file

@ -548,9 +548,6 @@ void M_PlayMenuJam(void)
return; return;
} }
if (soundtest.playing)
return;
const boolean trulystarted = M_GameTrulyStarted(); const boolean trulystarted = M_GameTrulyStarted();
const boolean profilemode = ( const boolean profilemode = (
optionsmenu.profilemenu optionsmenu.profilemenu

2
src/menus/options-1.c
View file

@ -91,6 +91,8 @@ void M_ResetOptions(void)
// For profiles: // For profiles:
memset(setup_player, 0, sizeof(setup_player)); memset(setup_player, 0, sizeof(setup_player));
optionsmenu.profile = NULL; optionsmenu.profile = NULL;
optionsmenu.profilemenu = false;
optionsmenu.resetprofilemenu = false;
} }
void M_InitOptions(INT32 choice) void M_InitOptions(INT32 choice)

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

@ -53,8 +53,7 @@ void M_FirstPickProfile(INT32 c)
{ {
if (c == MA_YES) if (c == MA_YES)
{ {
M_ResetOptions(); // Reset all options variables otherwise things are gonna go reaaal bad lol. 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.
PR_ApplyProfile(optionsmenu.profilen, 0); PR_ApplyProfile(optionsmenu.profilen, 0);
@ -162,7 +161,7 @@ void M_HandleProfileSelect(INT32 ch)
if (menutransition.tics == 0 && optionsmenu.resetprofile) if (menutransition.tics == 0 && optionsmenu.resetprofile)
{ {
optionsmenu.profile = NULL; // Make sure to reset that when transitions are done.' optionsmenu.profile = NULL; // Make sure to reset that when transitions are done.
optionsmenu.resetprofile = false; optionsmenu.resetprofile = false;
} }

3
src/menus/options-profiles-edit-1.c
View file

@ -135,8 +135,7 @@ static void M_ProfileEditExit(void)
} }
else else
{ {
M_ResetOptions(); // Reset all options variables otherwise things are gonna go reaaal bad lol. 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.
} }
PR_SaveProfiles(); // save profiles after we do that. PR_SaveProfiles(); // save profiles after we do that.