added initializing pointer

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 676ebf8aa3d9db839d3921b76032c6fadd76e2f5..5d191f027233d559a855fb16b5d50b00a2d19e25 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -12934,13 +12934,25 @@ 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();
   int num_music = getMusicListSize();
   int num_music_noconf = 0;
   int num_sounds = getSoundListSize();
-  Directory *dir;
+  Directory *dir = NULL;
   DirectoryEntry *dir_entry;
   struct FileInfo *music, *sound;
   struct MusicFileInfo *next, **new;
@@ -12993,7 +13005,18 @@ void LoadMusicInfo(void)
     }
   }
 
-  if ((dir = openDirectory(music_directory)) == NULL)
+  // if all levels have game music configured, do not read music from directory
+  if (!checkLevelSetHasMusic_NoConf())
+  {
+    read_music_from_directory = FALSE;
+  }
+  else if (music_directory == NULL)
+  {
+    Warn("cannot find music directory with unconfigured music");
+
+    read_music_from_directory = FALSE;
+  }
+  else if ((dir = openDirectory(music_directory)) == NULL)
   {
     Warn("cannot read music directory '%s'", music_directory);