From: Holger Schemel <info@artsoft.org>
Date: Mon, 29 Apr 2002 23:37:53 +0000 (+0200)
Subject: rnd-20020430-2-src
X-Git-Tag: 2.1.0^2~41
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=0a85e6bd82e4c5c495be7201f672f788123dcb84;p=rocksndiamonds.git

rnd-20020430-2-src
---

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 60b8bc30..5d0817a3 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -89,7 +89,7 @@ static void SoundServer_StopAllSounds();
 
 static void ReloadCustomSounds();
 static void ReloadCustomMusic();
-static void FreeSound(SoundInfo *);
+static void FreeSound(void *);
 
 #if defined(PLATFORM_UNIX)
 static int OpenAudioDevice(char *audio_device_name)
@@ -1666,7 +1666,13 @@ static void LoadSoundsInfo()
 
 #if 1
     for (i=0; i<num_sounds; i++)
-      printf("'%s' -> '%s'\n", sound_effect[i].text, sound_effect[i].filename);
+    {
+      printf("'%s' ", sound_effect[i].text);
+      if (sound_effect[i].filename)
+	printf("-> '%s'\n", sound_effect[i].filename);
+      else
+	printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename);
+    }
 #endif
   }
 }
@@ -1774,8 +1780,10 @@ void InitReloadMusic(char *set_name)
   InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC);
 }
 
-void FreeSound(SoundInfo *sound)
+void FreeSound(void *ptr)
 {
+  SoundInfo *sound = (SoundInfo *)ptr;
+
   if (sound == NULL)
     return;
 
diff --git a/src/main.c b/src/main.c
index a3fb8061..9a1b0a8b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -139,9 +139,10 @@ char *sound_name[NUM_SOUNDS] =
 /* sound effects: setup file identifiers and corresponding default filenames */
 struct SoundEffectInfo sound_effects[NUM_SOUND_EFFECTS] =
 {
-  { "infotron_collecting",	"infotron.wav" },
-  { "zonk_falling",		"zonkdown.wav" },
-  { "zonk_pushing",		"zonkpush.wav" }
+  { "infotron_collecting",	"infotron.wav"	},
+  { "zonk_falling",		"zonkdown.wav"	},
+  { "zonk_pushing",		"zonkpush.wav"	},
+  { "player_screaming",		"autsch.wav"	}
 };
 
 struct SoundEffectInfo sound_effects_NEW[] =
diff --git a/src/main.h b/src/main.h
index a820598a..1b97cd4e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1445,8 +1445,9 @@ extern int		num_element_info;
 #define SND_TEST1		0
 #define SND_TEST2		1
 #define SND_TEST3		2
+#define SND_TEST4		3
 
-#define NUM_SOUND_EFFECTS	3
+#define NUM_SOUND_EFFECTS	4
 
 
 #define SND_AMOEBA_GROWING		0
diff --git a/src/timestamp.h b/src/timestamp.h
index e0f52345..b89c8546 100644
--- a/src/timestamp.h
+++ b/src/timestamp.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-04-30 00:42]"
+#define COMPILE_DATE_STRING "[2002-04-30 01:24]"