rnd-20020510-2-src

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

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 916d92f10f4b19f424de7d3f4c229dc9063701da..42c4a6ecfeba9c9df412a0673046a450863afa55 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -745,10 +745,11 @@ inline void OpenAudio(void)
   audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0;
   audio.soundserver_pid = -1;
   audio.device_name = NULL;
-  audio.device_fd = 0;
+  audio.device_fd = -1;
 
-  audio.channels = 0;
+  audio.num_channels = 0;
   audio.music_channel = 0;
+  audio.first_sound_channel = 0;
 
 #if defined(TARGET_SDL)
   SDLOpenAudio();
@@ -780,13 +781,6 @@ inline void SetAudioMode(boolean enabled)
   audio.sound_enabled = enabled;
 }
 
-inline void SetAudioReloadFunctions(void (*func_reload_sounds)(void),
-                                   void (*func_reload_music)(void))
-{
-  audio.func_reload_sounds = func_reload_sounds;
-  audio.func_reload_music = func_reload_music;
-}
-
 
 /* ========================================================================= */
 /* event functions                                                           */