rnd-20020424-2-src

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

diff --git a/src/libgame/system.c b/src/libgame/system.c
index e1ac9ccc26659467c0490607596c87ed8e235ca2..916d92f10f4b19f424de7d3f4c229dc9063701da 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -669,7 +669,8 @@ Bitmap *LoadImage(char *filename)
   new_bitmap = X11LoadImage(filename);
 #endif
 
-  new_bitmap->source_filename = getStringCopy(filename);
+  if (new_bitmap)
+    new_bitmap->source_filename = getStringCopy(filename);
 
   return new_bitmap;
 }
@@ -737,9 +738,8 @@ inline void OpenAudio(void)
   audio.sound_available = FALSE;
   audio.music_available = FALSE;
   audio.loops_available = FALSE;
-  audio.mods_available = FALSE;
-  audio.sound_enabled = FALSE;
 
+  audio.sound_enabled = FALSE;
   audio.sound_deactivated = FALSE;
 
   audio.soundserver_pipe[0] = audio.soundserver_pipe[1] = 0;
@@ -749,7 +749,6 @@ inline void OpenAudio(void)
 
   audio.channels = 0;
   audio.music_channel = 0;
-  audio.music_nr = 0;
 
 #if defined(TARGET_SDL)
   SDLOpenAudio();
@@ -781,6 +780,13 @@ 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                                                           */