rnd-20030121-1-src

[rocksndiamonds.git] / src / libgame / sound.c

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 004c445828611907b7d199e3800da0ac76b1f9ce..ffb9925b47533b7106e55f672caae4b3c10c64ff 100644 (file)
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -1765,9 +1765,29 @@ static void *Load_WAV(char *filename)
   return snd_info;
 }
 
-struct FileInfo *getCurrentSoundList()
+int getSoundListSize()
 {
-  return sound_info->file_list;
+  return (sound_info->num_file_list_entries +
+         sound_info->num_dynamic_file_list_entries);
+}
+
+struct FileInfo *getSoundListEntry(int pos)
+{
+  int num_list_entries = sound_info->num_file_list_entries;
+  int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+
+  return (pos < num_list_entries ? &sound_info->file_list[list_pos] :
+         &sound_info->dynamic_file_list[list_pos]);
+}
+
+int getSoundListPropertyMappingSize()
+{
+  return sound_info->num_property_mapping_entries;
+}
+
+struct PropertyMapping *getSoundListPropertyMapping()
+{
+  return sound_info->property_mapping;
 }
 
 void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
@@ -1784,14 +1804,17 @@ void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
   /* ---------- 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->file_list =
+    getFileListFromConfigList(config_list, config_suffix_list,
+                             num_file_list_entries);
+  sound_info->dynamic_file_list = NULL;
 
   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->file_list =
-    getFileListFromConfigList(config_list, config_suffix_list,
-                             num_file_list_entries);
   sound_info->suffix_list = config_suffix_list;
 
   /* ---------- initialize base prefix and suffixes lists ---------- */
@@ -1811,12 +1834,18 @@ void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
   sound_info->base_prefixes = base_prefixes;
   sound_info->ext1_suffixes = ext1_suffixes;
   sound_info->ext2_suffixes = ext2_suffixes;
-  sound_info->custom_setup_list = NULL;
+
+  sound_info->num_property_mapping_entries = 0;
+
+  sound_info->property_mapping = NULL;
 
   /* ---------- initialize artwork reference and content lists ---------- */
 
+  sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *);
+
   sound_info->artwork_list =
     checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
+  sound_info->dynamic_artwork_list = NULL;
 
   sound_info->content_list = NULL;
 
@@ -1910,7 +1939,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;
     }
   }
 
@@ -2123,7 +2152,7 @@ void FreeMusic(MusicInfo *music)
 
 void FreeAllSounds()
 {
-  FreeCustomArtworkList(sound_info);
+  FreeCustomArtworkLists(sound_info);
 }
 
 void FreeAllMusic()