X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=1a403e7be7c60ccfd53b0a2b614af3c41f1dd237;hb=ee0895b12e544444db37febb1242bcc8a72d6ad8;hp=214b27bf8299de7d20d7705d24f8653a1a5fc0bb;hpb=f4fa296527b424d80cb6ed86809986455613783c;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 214b27bf..1a403e7b 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -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;