level: move main menu music option check to initialization

LostArtefacts · Sep 26, 2024 · 60f033a · 60f033a
1 parent 614c18e
commit 60f033a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/game/level.c b/src/game/level.c
@@ -1152,12 +1152,14 @@ bool Level_Initialise(int32_t level_num)
     Music_SetVolume(g_Config.music_volume);
     Sound_ResetEffects();
 
-    Viewport_SetFOV(Viewport_GetUserFOV());
-
-    if (g_GameFlow.levels[level_num].music) {
+    const bool disable_music = level_num == g_GameFlow.title_level_num
+        && !g_Config.enable_music_in_menu;
+    if (g_GameFlow.levels[level_num].music && !disable_music) {
         Music_PlayLooped(g_GameFlow.levels[level_num].music);
     }
 
+    Viewport_SetFOV(Viewport_GetUserFOV());
+
     g_InvItemPuzzle1.string = g_GameFlow.levels[level_num].puzzle1;
     g_InvItemPuzzle2.string = g_GameFlow.levels[level_num].puzzle2;
     g_InvItemPuzzle3.string = g_GameFlow.levels[level_num].puzzle3;

diff --git a/src/game/music.c b/src/game/music.c
@@ -131,11 +131,6 @@ bool Music_PlayLooped(MUSIC_TRACK_ID track)
         return false;
     }
 
-    if (g_CurrentLevel == g_GameFlow.title_level_num
-        && !g_Config.enable_music_in_menu) {
-        return false;
-    }
-
     M_StopActiveStream();
 
     char *file_path = M_GetTrackFileName(track);