X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=47dfe11972294618b3aaa16a27516a5242f7e69d;hb=685cf50a110c3294f71dba9004812f53d0623692;hp=363e033ecc9da80c014a910ec30146978ca8b8c0;hpb=97c3df7e864d08508a6b1c2a4001f9e7868719f6;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 363e033e..47dfe119 100644
--- a/src/files.c
+++ b/src/files.c
@@ -12937,29 +12937,14 @@ 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_noconf = getMusicListSize_NoConf();
   int num_music = getMusicListSize();
-  int num_music_noconf = 0;
   int num_sounds = getSoundListSize();
-  Directory *dir = NULL;
-  DirectoryEntry *dir_entry;
   struct FileInfo *music, *sound;
   struct MusicFileInfo *next, **new;
-  boolean read_music_from_directory = TRUE;
+
   int i;
 
   while (music_file_info != NULL)
@@ -12985,89 +12970,64 @@ void LoadMusicInfo(void)
 
   new = &music_file_info;
 
-  for (i = 0; i < num_music; i++)
+  // get (configured or unconfigured) music file info for all levels
+  for (i = leveldir_current->first_level;
+       i <= leveldir_current->last_level; i++)
   {
-    music = getMusicListEntry(i);
+    int music_nr;
 
-    if (music->filename == NULL)
-      continue;
+    if (levelset.music[i] != MUS_UNDEFINED)
+    {
+      // get music file info for configured level music
+      music_nr = levelset.music[i];
+    }
+    else
+    {
+      // get music file info for unconfigured level music
+      int level_pos = i - leveldir_current->first_level;
 
-    if (strEqual(music->filename, UNDEFINED_FILENAME))
-      continue;
+      music_nr = MAP_NOCONF_MUSIC(level_pos % num_music_noconf);
+    }
 
-    // a configured file may be not recognized as music
-    if (!FileIsMusic(music->filename))
+    char *basename = getMusicInfoEntryFilename(music_nr);
+
+    if (basename == NULL)
       continue;
 
-    if (!music_info_listed(music_file_info, music->filename))
+    if (!music_info_listed(music_file_info, basename))
     {
-      *new = get_music_file_info(music->filename, i);
+      *new = get_music_file_info(basename, music_nr);
 
       if (*new != NULL)
 	new = &(*new)->next;
     }
   }
 
-  // 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);
-
-    read_music_from_directory = FALSE;
-  }
-
-  while (read_music_from_directory &&
-	 (dir_entry = readDirectory(dir)) != NULL)	// loop all entries
+  // get music file info for all remaining configured music files
+  for (i = 0; i < num_music; i++)
   {
-    char *basename = dir_entry->basename;
-    boolean music_already_used = FALSE;
-    int i;
-
-    // skip all music files that are configured in music config file
-    for (i = 0; i < num_music; i++)
-    {
-      music = getMusicListEntry(i);
-
-      if (music->filename == NULL)
-	continue;
+    music = getMusicListEntry(i);
 
-      if (strEqual(basename, music->filename))
-      {
-	music_already_used = TRUE;
-	break;
-      }
-    }
+    if (music->filename == NULL)
+      continue;
 
-    if (music_already_used)
+    if (strEqual(music->filename, UNDEFINED_FILENAME))
       continue;
 
-    if (!FileIsMusic(dir_entry->filename))
+    // a configured file may be not recognized as music
+    if (!FileIsMusic(music->filename))
       continue;
 
-    if (!music_info_listed(music_file_info, basename))
+    if (!music_info_listed(music_file_info, music->filename))
     {
-      *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf));
+      *new = get_music_file_info(music->filename, i);
 
       if (*new != NULL)
 	new = &(*new)->next;
     }
-
-    num_music_noconf++;
   }
 
-  if (dir != NULL)
-    closeDirectory(dir);
-
+  // get sound file info for all configured sound files
   for (i = 0; i < num_sounds; i++)
   {
     sound = getSoundListEntry(i);