From e96913bda7c1a3f2008874cdc29e2fa93c37a7ce Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 Sep 2025 21:13:05 +0100 Subject: [PATCH 1/2] Cleans up some profilemenu state in M_ResetOptions This would pollute into M_PlayMenuJam and possibly cause it to play whenever --- src/menus/options-1.c | 2 ++ src/menus/options-profiles-1.c | 5 ++--- src/menus/options-profiles-edit-1.c | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/menus/options-1.c b/src/menus/options-1.c index 56b09d721..41bc817aa 100644 --- a/src/menus/options-1.c +++ b/src/menus/options-1.c @@ -91,6 +91,8 @@ void M_ResetOptions(void) // For profiles: memset(setup_player, 0, sizeof(setup_player)); optionsmenu.profile = NULL; + optionsmenu.profilemenu = false; + optionsmenu.resetprofilemenu = false; } void M_InitOptions(INT32 choice) diff --git a/src/menus/options-profiles-1.c b/src/menus/options-profiles-1.c index 85e1fd73d..5ac4c9bf2 100644 --- a/src/menus/options-profiles-1.c +++ b/src/menus/options-profiles-1.c @@ -53,8 +53,7 @@ void M_FirstPickProfile(INT32 c) { if (c == MA_YES) { - 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. + M_ResetOptions(); // Reset all options variables otherwise things are gonna go reaaal bad lol. PR_ApplyProfile(optionsmenu.profilen, 0); @@ -162,7 +161,7 @@ void M_HandleProfileSelect(INT32 ch) 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; } diff --git a/src/menus/options-profiles-edit-1.c b/src/menus/options-profiles-edit-1.c index 948e9178a..880b7f49b 100644 --- a/src/menus/options-profiles-edit-1.c +++ b/src/menus/options-profiles-edit-1.c @@ -135,8 +135,7 @@ static void M_ProfileEditExit(void) } else { - 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. + M_ResetOptions(); // Reset all options variables otherwise things are gonna go reaaal bad lol. } PR_SaveProfiles(); // save profiles after we do that. From 254496c8d84f62cdaf160cfe309a8eceb166df3d Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 15 Sep 2025 21:13:46 +0100 Subject: [PATCH 2/2] You should definitely evaluate M_PlayMenuJam even if sound test is playing - that will just play over the behind-the-scenes audio setup --- src/k_menufunc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/k_menufunc.c b/src/k_menufunc.c index 9c3e0da04..1e832f748 100644 --- a/src/k_menufunc.c +++ b/src/k_menufunc.c @@ -548,9 +548,6 @@ void M_PlayMenuJam(void) return; } - if (soundtest.playing) - return; - const boolean trulystarted = M_GameTrulyStarted(); const boolean profilemode = ( optionsmenu.profilemenu