rnd-20030118-6-src
[rocksndiamonds.git] / src / libgame / sound.c
index 214b27bf8299de7d20d7705d24f8653a1a5fc0bb..1a403e7be7c60ccfd53b0a2b614af3c41f1dd237 100644 (file)
@@ -1789,6 +1789,7 @@ void InitSoundList(struct ConfigInfo *config_list,
     getFileListFromConfigList(config_list, config_suffix_list,
                              num_file_list_entries);
   sound_info->suffix_list = config_suffix_list;
+  sound_info->custom_setup_list = NULL;
 
   sound_info->artwork_list =
     checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
@@ -2010,6 +2011,7 @@ static void ReloadCustomSounds()
   printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
 #endif
 
+  LoadArtworkConfig(sound_info);
   ReloadCustomArtworkList(sound_info);
 }
 
@@ -2022,19 +2024,20 @@ static void ReloadCustomMusic()
   LoadCustomMusic();
 }
 
-void InitReloadSounds(char *set_identifier)
+void InitReloadCustomSounds(char *set_identifier)
 {
   if (!audio.sound_available)
     return;
 
 #if defined(AUDIO_UNIX_NATIVE)
+  LoadArtworkConfig(sound_info);       /* also load config on sound client */
   WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
 #else
   ReloadCustomSounds();
 #endif
 }
 
-void InitReloadMusic(char *set_identifier)
+void InitReloadCustomMusic(char *set_identifier)
 {
   if (!audio.music_available)
     return;