rnd-20020430-2-src

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 60b8bc306cdc95f403c12cb03512863af16303dd..5d0817a33e0ce9558520a9623fd0ae0e4569ce52 100644 (file)
--- 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 a3fb80612d8209917cfbf484ee2651c4a20fb3e2..9a1b0a8b6be6709ef00f2e37dfe0bb44ae50712f 100644 (file)
--- 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 a820598a929e7d4ca06c2a779be55f39282302a6..1b97cd4ee17561d49989c40bea848029c0a639de 100644 (file)
--- 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 e0f523454dc005e06b86483242eb562c15452ea1..b89c85466c8739879c12b69318dbf91659f8a6b3 100644 (file)
--- 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]"