projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030118-6-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.c
diff --git
a/src/libgame/sound.c
b/src/libgame/sound.c
index 30946f248c7acbd625c595e6672fdcfa58b7dd04..1a403e7be7c60ccfd53b0a2b614af3c41f1dd237 100644
(file)
--- a/
src/libgame/sound.c
+++ b/
src/libgame/sound.c
@@
-2011,6
+2011,7
@@
static void ReloadCustomSounds()
printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
#endif
printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
#endif
+ LoadArtworkConfig(sound_info);
ReloadCustomArtworkList(sound_info);
}
ReloadCustomArtworkList(sound_info);
}
@@
-2023,19
+2024,20
@@
static void ReloadCustomMusic()
LoadCustomMusic();
}
LoadCustomMusic();
}
-void InitReloadSounds(char *set_identifier)
+void InitReload
Custom
Sounds(char *set_identifier)
{
if (!audio.sound_available)
return;
#if defined(AUDIO_UNIX_NATIVE)
{
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
}
WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
#else
ReloadCustomSounds();
#endif
}
-void InitReloadMusic(char *set_identifier)
+void InitReload
Custom
Music(char *set_identifier)
{
if (!audio.music_available)
return;
{
if (!audio.music_available)
return;