X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=61d5d29e8deffa5c0122a1df5bd9a5d3f165b5dc;hb=be2766c926ff78b2985565fd9c12390eb5655112;hp=460bed15cb4ef98dff342bd63e386392c2fc6cae;hpb=7b47ce7ba0f673f0de5130daf5726104d0b38902;p=rocksndiamonds.git

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 460bed15..61d5d29e 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -1772,42 +1772,58 @@ struct FileInfo *getCurrentSoundList()
 
 void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
 		   struct ConfigInfo *config_suffix_list,
-		   struct ConfigInfo *ext1_suffix_list,
-		   struct ConfigInfo *ext2_suffix_list)
+		   char **base_prefixes,
+		   char **ext1_suffixes,
+		   char **ext2_suffixes)
 {
   int i;
 
   sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
-
   sound_info->type = ARTWORK_TYPE_SOUNDS;
 
+  /* ---------- initialize file list and suffix lists ---------- */
+
   sound_info->num_file_list_entries = num_file_list_entries;
+  sound_info->num_dynamic_file_list_entries = 0;
 
   sound_info->num_suffix_list_entries = 0;
   for (i=0; config_suffix_list[i].token != NULL; i++)
     sound_info->num_suffix_list_entries++;
 
-  sound_info->num_ext1_suffix_list_entries = 0;
-  for (i=0; ext1_suffix_list[i].token != NULL; i++)
-    sound_info->num_ext1_suffix_list_entries++;
-
-  sound_info->num_ext2_suffix_list_entries = 0;
-  for (i=0; ext2_suffix_list[i].token != NULL; i++)
-    sound_info->num_ext2_suffix_list_entries++;
-
   sound_info->file_list =
     getFileListFromConfigList(config_list, config_suffix_list,
 			      num_file_list_entries);
+  sound_info->dynamic_file_list = NULL;
+
   sound_info->suffix_list = config_suffix_list;
-  sound_info->ext1_suffix_list = ext1_suffix_list;
-  sound_info->ext2_suffix_list = ext2_suffix_list;
-  sound_info->custom_setup_list = NULL;
+
+  /* ---------- initialize base prefix and suffixes lists ---------- */
+
+  sound_info->num_base_prefixes = 0;
+  for (i=0; base_prefixes[i] != NULL; i++)
+    sound_info->num_base_prefixes++;
+
+  sound_info->num_ext1_suffixes = 0;
+  for (i=0; ext1_suffixes[i] != NULL; i++)
+    sound_info->num_ext1_suffixes++;
+
+  sound_info->num_ext2_suffixes = 0;
+  for (i=0; ext2_suffixes[i] != NULL; i++)
+    sound_info->num_ext2_suffixes++;
+
+  sound_info->base_prefixes = base_prefixes;
+  sound_info->ext1_suffixes = ext1_suffixes;
+  sound_info->ext2_suffixes = ext2_suffixes;
+
+  /* ---------- initialize artwork reference and content lists ---------- */
 
   sound_info->artwork_list =
     checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
 
   sound_info->content_list = NULL;
 
+  /* ---------- initialize artwork loading/freeing functions ---------- */
+
   sound_info->load_artwork = Load_WAV;
   sound_info->free_artwork = FreeSound;
 
@@ -1896,7 +1912,7 @@ void LoadCustomMusic(void)
     {
       num_music++;
       Music = checked_realloc(Music, num_music * sizeof(MusicInfo *));
-      Music[num_music -1] = mus_info;
+      Music[num_music - 1] = mus_info;
     }
   }