From: Holger Schemel <info@artsoft.org>
Date: Sun, 28 Apr 2002 21:51:32 +0000 (+0200)
Subject: rnd-20020428-3-src
X-Git-Tag: 2.1.0^2~43
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=884db54d739f5838243315f390d28634cb99a7d9;p=rocksndiamonds.git

rnd-20020428-3-src
---

diff --git a/src/init.c b/src/init.c
index ef6586f7..232f37a4 100644
--- a/src/init.c
+++ b/src/init.c
@@ -153,6 +153,7 @@ void InitNetworkServer()
 #endif
 }
 
+#if 0
 static void ReloadCustomSounds()
 {
   int i;
@@ -161,9 +162,8 @@ static void ReloadCustomSounds()
   printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
 #endif
 
-  FreeAllSounds();
+  LoadSoundsInfo();
 
-  InitSoundList(NUM_SOUNDS);
   for(i=0; i<NUM_SOUNDS; i++)
     LoadSoundToList(sound_name[i], i);
 }
@@ -178,11 +178,15 @@ static void ReloadCustomMusic()
 
   LoadCustomMusic();
 }
+#endif
 
 static void InitSoundServer()
 {
   OpenAudio();
+#if 0
   SetAudioReloadFunctions(ReloadCustomSounds, ReloadCustomMusic);
+#endif
+  InitSoundList(sound_name, NUM_SOUNDS);
 
   StartSoundserver();
 }
diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index f7d30d64..122f1dfe 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1814,6 +1814,25 @@ void LoadArtworkInfo()
 #endif
 }
 
+void LoadSoundsInfo()
+{
+#if 0
+  char *filename = getCustomSoundFilename(SOUNDSINFO_FILENAME);
+  struct SetupFileList *setup_file_list = loadSetupFileList(filename);
+
+  if (setup_file_list)
+  {
+#if 0
+    for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
+      setSetupInfo(levelinfo_tokens, i,
+		   getTokenValue(setup_file_list, levelinfo_tokens[i].text));
+#endif
+
+    freeSetupFileList(setup_file_list);
+  }
+#endif
+}
+
 static void SaveUserLevelInfo()
 {
   char *filename;
diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 4a9fa66b..a1813a4c 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -187,6 +187,7 @@ char *getSetupLine(struct TokenInfo *, char *, int);
 
 void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
+void LoadSoundsInfo(void);
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
 void LoadLevelSetup_SeriesInfo(void);
diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 0e90a582..61644cda 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -27,6 +27,7 @@
 static SoundInfo **Sound = NULL;
 static MusicInfo **Music = NULL;
 static int num_sounds = 0, num_music = 0;
+static char **sound_name;
 
 
 /* ========================================================================= */
@@ -70,6 +71,10 @@ static void SoundServer_StopSound(struct SoundControl);
 static void SoundServer_StopAllSounds();
 #endif
 
+static void ReloadCustomSounds();
+static void ReloadCustomMusic();
+static void FreeSound(SoundInfo *);
+
 #if defined(PLATFORM_UNIX)
 static int OpenAudioDevice(char *audio_device_name)
 {
@@ -277,12 +282,18 @@ void SoundServer(void)
       if (snd_ctrl.reload_sounds)
       {
 	artwork.sounds_set_current = set_name;
+	ReloadCustomSounds();
+#if 0
 	audio.func_reload_sounds();
+#endif
       }
       else
       {
 	artwork.music_set_current = set_name;
+	ReloadCustomMusic();
+#if 0
 	audio.func_reload_music();
+#endif
       }
 
       free(set_name);
@@ -1100,6 +1111,10 @@ static SoundInfo *Load_WAV(char *filename)
   if (!audio.sound_available)
     return NULL;
 
+#if 1
+  printf("loading WAV file '%s'\n", filename);
+#endif
+
   snd_info = checked_calloc(sizeof(SoundInfo));
 
 #if defined(TARGET_SDL)
@@ -1203,22 +1218,37 @@ static SoundInfo *Load_WAV(char *filename)
   return snd_info;
 }
 
-SoundInfo *LoadCustomSound(char *basename)
+static void LoadCustomSound(SoundInfo **snd_info, char *basename)
 {
   char *filename = getCustomSoundFilename(basename);
 
-  if (filename == NULL)
+  if (filename == NULL)		/* (should never happen) */
   {
     Error(ERR_WARN, "cannot find sound file '%s'", basename);
-    return FALSE;
+    return;
   }
 
-  return Load_WAV(filename);
+  if (*snd_info && strcmp(filename, (*snd_info)->source_filename) == 0)
+  {
+    /* The old and new sound are the same (have the same filename and path).
+       This usually means that this sound does not exist in this sound set
+       and a fallback to the existing sound is done. */
+
+    return;
+  }
+
+  if (*snd_info)
+    FreeSound(*snd_info);
+
+  *snd_info = Load_WAV(filename);
 }
 
-void InitSoundList(int num_list_entries)
+void InitSoundList(char *sound_name_list[], int num_list_entries)
 {
-  Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+  if (Sound == NULL)
+    Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+
+  sound_name = sound_name_list;
   num_sounds = num_list_entries;
 }
 
@@ -1227,10 +1257,7 @@ void LoadSoundToList(char *basename, int list_pos)
   if (Sound == NULL || list_pos >= num_sounds)
     return;
 
-  if (Sound[list_pos])
-    FreeSound(Sound[list_pos]);
-
-  Sound[list_pos] = LoadCustomSound(basename);
+  LoadCustomSound(&Sound[list_pos], basename);
 }
 
 static MusicInfo *Load_MOD(char *filename)
@@ -1507,6 +1534,31 @@ void StopSoundExt(int nr, int method)
 #endif
 }
 
+static void ReloadCustomSounds()
+{
+  int i;
+
+#if 1
+  printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
+#endif
+
+  LoadSoundsInfo();
+
+  for(i=0; i<num_sounds; i++)
+    LoadSoundToList(sound_name[i], i);
+}
+
+static void ReloadCustomMusic()
+{
+#if 1
+  printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+#endif
+
+  FreeAllMusic();
+
+  LoadCustomMusic();
+}
+
 static void InitReloadSoundsOrMusic(char *set_name, int type)
 {
 #if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 14662343..8f6b123b 100644
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -192,6 +192,19 @@ struct AudioFormatInfo
   int fragment_size;		/* audio device fragment size in bytes */
 };
 
+#if 0
+struct SoundsInfo
+{
+  int num_sounds;
+  char *sound_name;
+
+#if 0
+  void (*func_reload_sounds)(void);
+  void (*func_reload_music)(void);
+#endif
+}
+#endif
+
 struct SampleInfo
 { 
   int type;
@@ -242,12 +255,6 @@ void StartSoundserver(void);
 void SoundServer(void);
 
 /* sound client functions */
-void ReloadSounds(char *);
-void ReloadMusic(char *);
-SoundInfo *LoadCustomSound(char *);
-void InitSoundList(int);
-void LoadSoundToList(char *, int);
-void LoadCustomMusic(void);
 void PlayMusic(int);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
@@ -261,10 +268,9 @@ void StopMusic(void);
 void StopSound(int);
 void StopSounds(void);
 void StopSoundExt(int, int);
+void InitSoundList(char **, int);
 void InitReloadSounds(char *);
 void InitReloadMusic(char *);
-void FreeSound(SoundInfo *);
-void FreeMusic(MusicInfo *);
 void FreeAllSounds(void);
 void FreeAllMusic(void);
 
diff --git a/src/libgame/system.c b/src/libgame/system.c
index 916d92f1..04991992 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -780,12 +780,14 @@ inline void SetAudioMode(boolean enabled)
   audio.sound_enabled = enabled;
 }
 
+#if 0
 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;
 }
+#endif
 
 
 /* ========================================================================= */
diff --git a/src/libgame/system.h b/src/libgame/system.h
index 4d8940d1..46d304bb 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -236,9 +236,6 @@ struct AudioSystemInfo
   boolean sound_enabled;
   boolean sound_deactivated;	/* for temporarily disabling sound */
 
-  void (*func_reload_sounds)(void);
-  void (*func_reload_music)(void);
-
   int soundserver_pipe[2];
   int soundserver_pid;
   char *device_name;
@@ -480,8 +477,10 @@ void ReloadCustomImage(Bitmap *, char *);
 inline void OpenAudio(void);
 inline void CloseAudio(void);
 inline void SetAudioMode(boolean);
+#if 0
 inline void SetAudioReloadFunctions(void (*func_reload_sounds)(void),
 				    void (*func_reload_music)(void));
+#endif
 
 inline void InitEventFilter(EventFilter);
 inline boolean PendingEvent(void);
diff --git a/src/main.c b/src/main.c
index cf78c0cb..335cee23 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,6 +136,19 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
+/* sound effects: setup file identifiers and corresponding default filenames */
+struct
+{
+  char *identifier;
+  char *default_filename;
+}
+sound_effect[NUM_SOUND_EFFECTS] =
+{
+  { "collecting_infotron",	"infotron.wav" },
+  { "falling_zonk",		"zonkdown.wav" },
+  { "pushing_zonk",		"zonkpush.wav" }
+};
+
 char *element_info[] =
 {
   "empty space",				/* 0 */
diff --git a/src/main.h b/src/main.h
index 4769e69b..18d355d0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1438,6 +1438,15 @@ extern int		num_element_info;
 
 #define NUM_SOUNDS		55
 
+
+/* sound effects */
+#define SND_TEST1		0
+#define SND_TEST2		1
+#define SND_TEST3		2
+
+#define NUM_SOUND_EFFECTS	3
+
+
 /* values for game_status */
 #define EXITGAME		0
 #define MAINMENU		1
diff --git a/src/timestamp.h b/src/timestamp.h
index ccf2e49c..4abab11c 100644
--- a/src/timestamp.h
+++ b/src/timestamp.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-04-25 00:14]"
+#define COMPILE_DATE_STRING "[2002-04-28 23:49]"