fixed reading music from directory if music configured for all levels

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 676ebf8aa3d9db839d3921b76032c6fadd76e2f5..39f145f539e1752a05c7a0a7e40e93fd11947055 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -12934,6 +12934,18 @@ static boolean sound_info_listed(struct MusicFileInfo *list, char *basename)
   return music_info_listed_ext(list, basename, TRUE);
 }
 
+static boolean checkLevelSetHasMusic_NoConf(void)
+{
+  int i;
+
+  for (i = leveldir_current->first_level;
+       i <= leveldir_current->last_level; i++)
+    if (levelset.music[level_nr] == MUS_UNDEFINED)
+      return TRUE;
+
+  return FALSE;
+}
+
 void LoadMusicInfo(void)
 {
   char *music_directory = getCustomMusicDirectory_NoConf();
@@ -12993,6 +13005,10 @@ void LoadMusicInfo(void)
     }
   }
 
+  // if all levels have game music configured, do not read music from directory
+  if (!checkLevelSetHasMusic_NoConf())
+    read_music_from_directory = FALSE;
+
   if ((dir = openDirectory(music_directory)) == NULL)
   {
     Warn("cannot read music directory '%s'", music_directory);