From: Holger Schemel <info@artsoft.org>
Date: Tue, 14 May 2002 00:30:45 +0000 (+0200)
Subject: rnd-20020514-1-src
X-Git-Tag: 2.1.0^2~20
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=62e8f84edbffc67d743bb2d6afff258079f041d5;p=rocksndiamonds.git

rnd-20020514-1-src
---

diff --git a/src/game.c b/src/game.c
index 417d00f9..0312c695 100644
--- a/src/game.c
+++ b/src/game.c
@@ -76,6 +76,7 @@
 #define DX_TIME			(DX + XX_TIME)
 #define DY_TIME			(DY + YY_TIME)
 
+#if 0
 #define IS_LOOP_SOUND(s)	((s) == SND_BD_MAGIC_WALL_RUNNING ||	\
 	 			 (s) == SND_BD_BUTTERFLY_MOVING ||	\
 				 (s) == SND_BD_FIREFLY_MOVING ||	\
@@ -98,6 +99,7 @@
 	 			 (s) == SND_PIG_MOVING ||	\
 				 (s) == SND_DRAGON_MOVING ||	\
 	 			 (s) == SND_DRAGON_BREATHING_FIRE)
+#endif
 
 /* values for player movement speed (which is in fact a delay value) */
 #define MOVE_DELAY_NORMAL_SPEED	8
@@ -128,6 +130,36 @@ static void HandleGameButtons(struct GadgetInfo *);
 
 static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS];
 
+static boolean is_loop_sound[NUM_SOUND_EFFECTS];
+static boolean is_loop_sound_initialized = FALSE;
+static int loop_sounds[] =
+{
+  SND_BD_MAGIC_WALL_RUNNING,
+  SND_BD_BUTTERFLY_MOVING,
+  SND_BD_FIREFLY_MOVING,
+  SND_SP_SNIKSNAK_MOVING,
+  SND_SP_ELECTRON_MOVING,
+  SND_DYNAMITE_BURNING,
+  SND_BUG_MOVING,
+  SND_SPACESHIP_MOVING,
+  SND_YAMYAM_MOVING,
+  SND_YAMYAM_WAITING,
+  SND_ROBOT_WHEEL_RUNNING,
+  SND_MAGIC_WALL_RUNNING,
+  SND_BALLOON_MOVING,
+  SND_MOLE_MOVING,
+  SND_TIMEGATE_WHEEL_RUNNING,
+  SND_CONVEYOR_BELT_RUNNING,
+  SND_DYNABOMB_BURNING,
+  SND_PACMAN_MOVING,
+  SND_PENGUIN_MOVING,
+  SND_PIG_MOVING,
+  SND_DRAGON_MOVING,
+  SND_DRAGON_BREATHING_FIRE
+};
+
+#define IS_LOOP_SOUND(x)	(is_loop_sound[x])
+
 
 
 #ifdef DEBUG
@@ -721,6 +753,20 @@ void InitGame()
     }
   }
 
+  /* initialize sound effect properties */
+  if (!is_loop_sound_initialized)
+  {
+    int i;
+
+    for (i=0; i<NUM_SOUND_EFFECTS; i++)
+      is_loop_sound[i] = FALSE;
+
+    for (i=0; i<SIZEOF_ARRAY_INT(loop_sounds); i++)
+      is_loop_sound[loop_sounds[i]] = TRUE;
+
+    is_loop_sound_initialized = TRUE;
+  }
+
   game.version = (tape.playing ? tape.game_version : level.game_version);
   game.emulation = (emulate_bd ? EMU_BOULDERDASH :
 		    emulate_sb ? EMU_SOKOBAN :
diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 048829f5..00919d38 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -2091,8 +2091,10 @@ void FreeAllSounds()
   if (Sound == NULL)
     return;
 
+#if 0
   printf("%s: FREEING SOUNDS ...\n",
 	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+#endif
 
   for(i=0; i<num_sounds; i++)
     deleteSoundEntry(&Sound[i]);
@@ -2100,8 +2102,10 @@ void FreeAllSounds()
     FreeSound(Sound[i]);
   */
 
+#if 0
   printf("%s: FREEING SOUNDS -- DONE\n",
 	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+#endif
 
   free(Sound);
 
diff --git a/src/main.c b/src/main.c
index 7c1ac0c5..971c97ca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,17 +136,6 @@ char *sound_name[NUM_SOUNDS] =
   "gate.wav"
 };
 
-#if 0
-/* sound effects: setup file identifiers and corresponding default filenames */
-struct SoundEffectInfo sound_effects[NUM_SOUND_EFFECTS] =
-{
-  { "infotron_collecting",		"infotron.wav"		}, /* TEST */
-  { "zonk_falling",			SND_FILE_UNDEFINED	}, /* TEST */
-  { "zonk_pushing",			"zonkpush.wav"		}, /* TEST */
-  { "player_screaming",			"autsch.wav"		}  /* TEST */
-};
-#endif
-
 struct SoundEffectInfo sound_effects[] =
 {
   /* sounds for Boulder Dash style elements and actions */
diff --git a/src/timestamp.h b/src/timestamp.h
index 757a3a8f..91e08e56 100644
--- a/src/timestamp.h
+++ b/src/timestamp.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-05-12 22:43]"
+#define COMPILE_DATE_STRING "[2002-05-13 21:42]"