X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=ef6586f701c4f6465f59766db271a4c1a7fb0555;hb=f13662d83b34ec1a6add839ed160eeb7c4296496;hp=5923322a7b265303c68486889628a3fba959c527;hpb=f1685723f2d920b7d7349c57e902c7adfaffdb1c;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 5923322a..ef6586f7 100644
--- a/src/init.c
+++ b/src/init.c
@@ -45,6 +45,7 @@ static void InitPlayerInfo(void);
 static void InitLevelInfo(void);
 static void InitArtworkInfo(void);
 static void InitNetworkServer(void);
+static void InitSoundServer(void);
 static void InitSound(void);
 static void InitGfx(void);
 static void InitGfxBackground(void);
@@ -74,7 +75,7 @@ void OpenAll(void)
   InitArtworkInfo();		/* needed before loading gfx, sound & music */
 
   InitCounter();
-  InitSound();
+  InitSoundServer();
   InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
@@ -89,6 +90,7 @@ void OpenAll(void)
 
   InitLevelInfo();
   InitGadgets();		/* needs to know number of level series */
+  InitSound();			/* needs to know current level directory */
 
   InitGfxBackground();
   InitToons();
@@ -151,39 +153,55 @@ void InitNetworkServer()
 #endif
 }
 
-void InitSound()
+static void ReloadCustomSounds()
 {
   int i;
 
-  OpenAudio();
+#if 1
+  printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
+#endif
+
+  FreeAllSounds();
 
+  InitSoundList(NUM_SOUNDS);
   for(i=0; i<NUM_SOUNDS; i++)
-  {
-    if (!LoadCustomSound(sound_name[i]))
-    {
-      Error(ERR_WARN, "sounds deactivated");
+    LoadSoundToList(sound_name[i], i);
+}
 
-      audio.sound_available = FALSE;
-      audio.loops_available = FALSE;
-      audio.sound_enabled = FALSE;
+static void ReloadCustomMusic()
+{
+#if 1
+  printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+#endif
 
-      return;
-    }
-  }
+  FreeAllMusic();
 
-  num_bg_loops = LoadCustomMusic();
+  LoadCustomMusic();
+}
+
+static void InitSoundServer()
+{
+  OpenAudio();
+  SetAudioReloadFunctions(ReloadCustomSounds, ReloadCustomMusic);
 
   StartSoundserver();
 }
 
-void InitTileClipmasks()
+static void InitSound()
+{
+  InitReloadSounds(artwork.snd_current->name);
+  InitReloadMusic(artwork.mus_current->name);
+}
+
+static void InitTileClipmasks()
 {
 #if defined(TARGET_X11)
-  GC copy_clipmask_gc;
   XGCValues clip_gc_values;
   unsigned long clip_gc_valuemask;
 
 #if defined(TARGET_X11_NATIVE)
+  GC copy_clipmask_gc;
+
   static struct
   {
     int start;
@@ -1602,8 +1620,9 @@ void CloseAllAndExit(int exit_value)
   int i;
 
   StopSounds();
-  FreeSounds(NUM_SOUNDS);
-  CloseAudio();
+  FreeAllSounds();
+  FreeAllMusic();
+  CloseAudio();		/* called after freeing sounds (needed for SDL) */
 
   FreeTileClipmasks();
   for(i=0; i<NUM_BITMAPS; i++)