X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f898c8ae0b3c0b29d912e1c99e8e4262b25beee5;hb=87af02f45b63b849773c7f830d69136d130acca0;hp=32e9e0d62989d82a0e4d93facacca99be36d9e82;hpb=d9ebb78b0e0290d76d3ee3d8f864ac6767cab61e;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 32e9e0d6..f898c8ae 100644
--- a/src/game.c
+++ b/src/game.c
@@ -19,12 +19,14 @@
 #include "init.h"
 #include "files.h"
 #include "tape.h"
-#include "joystick.h"
 #include "network.h"
 
 /* this switch controls how rocks move horizontally */
 #define OLD_GAME_BEHAVIOUR	FALSE
 
+/* EXPERIMENTAL STUFF */
+#define USE_NEW_AMOEBA_CODE	FALSE
+
 /* for DigField() */
 #define DF_NO_PUSH		0
 #define DF_DIG			1
@@ -74,12 +76,28 @@
 #define DX_TIME			(DX + XX_TIME)
 #define DY_TIME			(DY + YY_TIME)
 
-#define IS_LOOP_SOUND(s)	((s)==SND_KLAPPER || (s)==SND_ROEHR ||	\
-				 (s)==SND_NJAM || (s)==SND_MIEP)
-#define IS_MUSIC_SOUND(s)	((s)==SND_ALCHEMY || (s)==SND_CHASE || \
-				 (s)==SND_NETWORK || (s)==SND_CZARDASZ || \
-				 (s)==SND_TYGER || (s)==SND_VOYAGER || \
-				 (s)==SND_TWILIGHT)
+#define IS_LOOP_SOUND(s)	((s) == SND_BD_MAGIC_WALL_RUNNING ||	\
+	 			 (s) == SND_BD_BUTTERFLY_MOVING ||	\
+				 (s) == SND_BD_FIREFLY_MOVING ||	\
+	 			 (s) == SND_SP_SNIKSNAK_MOVING ||	\
+				 (s) == SND_SP_ELECTRON_MOVING ||	\
+	 			 (s) == SND_DYNAMITE_BURNING ||	\
+				 (s) == SND_BUG_MOVING ||	\
+	 			 (s) == SND_SPACESHIP_MOVING ||	\
+				 (s) == SND_YAMYAM_MOVING ||	\
+	 			 (s) == SND_YAMYAM_WAITING ||	\
+				 (s) == SND_ROBOT_WHEEL_RUNNING ||	\
+	 			 (s) == SND_MAGIC_WALL_RUNNING ||	\
+				 (s) == SND_BALLOON_MOVING ||	\
+	 			 (s) == SND_MOLE_MOVING ||	\
+				 (s) == SND_TIMEGATE_WHEEL_RUNNING ||	\
+	 			 (s) == SND_CONVEYOR_BELT_RUNNING ||	\
+				 (s) == SND_DYNABOMB_BURNING ||	\
+	 			 (s) == SND_PACMAN_MOVING ||	\
+				 (s) == SND_PENGUIN_MOVING ||	\
+	 			 (s) == SND_PIG_MOVING ||	\
+				 (s) == SND_DRAGON_MOVING ||	\
+	 			 (s) == SND_DRAGON_BREATHING_FIRE)
 
 /* values for player movement speed (which is in fact a delay value) */
 #define MOVE_DELAY_NORMAL_SPEED	8
@@ -171,10 +189,10 @@ void GetPlayerConfig()
     setup.sound = FALSE;
 
   if (!audio.loops_available)
-  {
     setup.sound_loops = FALSE;
+
+  if (!audio.music_available)
     setup.sound_music = FALSE;
-  }
 
   if (!video.fullscreen_available)
     setup.fullscreen = FALSE;
@@ -430,6 +448,18 @@ static void InitField(int x, int y, boolean init_game)
   }
 }
 
+void DrawGameDoorValues()
+{
+  DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
+	   int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
+	   int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_SCORE, DY + YY_SCORE,
+	   int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
+  DrawText(DX + XX_TIME, DY + YY_TIME,
+	   int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+}
+
 void InitGame()
 {
   int i, j, x, y;
@@ -437,6 +467,14 @@ void InitGame()
   boolean emulate_sb = TRUE;	/* unless non-SOKOBAN     elements found */
   boolean emulate_sp = TRUE;	/* unless non-SUPAPLEX    elements found */
 
+#if DEBUG
+#if USE_NEW_AMOEBA_CODE
+  printf("Using new amoeba code.\n");
+#else
+  printf("Using old amoeba code.\n");
+#endif
+#endif
+
   /* don't play tapes over network */
   network_playing = (options.network && !tape.playing);
 
@@ -480,16 +518,16 @@ void InitGame()
 
     player->frame_reset_delay = 0;
 
-    player->push_delay = 0;
-    player->push_delay_value = 5;
-
-    player->move_delay = 0;
     player->last_move_dir = MV_NO_MOVING;
     player->is_moving = FALSE;
 
+    player->move_delay = -1;	/* no initial move delay */
     player->move_delay_value =
       (level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED);
 
+    player->push_delay = 0;
+    player->push_delay_value = 5;
+
     player->snapped = FALSE;
 
     player->last_jx = player->last_jy = 0;
@@ -682,7 +720,7 @@ void InitGame()
 
   /* dynamically adjust element properties according to game engine version */
   {
-    static int ep_slippery[] =
+    static int ep_em_slippery_wall[] =
     {
       EL_BETON,
       EL_MAUERWERK,
@@ -691,14 +729,30 @@ void InitGame()
       EL_MAUER_Y,
       EL_MAUER_XY
     };
-    static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+#if 1
+    static int ep_em_slippery_wall_num = SIZEOF_ARRAY_INT(ep_em_slippery_wall);
+#else
+    static int ep_em_slippery_wall_num =
+      sizeof(ep_em_slippery_wall) / sizeof(int);
+#endif
 
-    for (i=0; i<ep_slippery_num; i++)
+    /*
+    printf("level %d: game.version == %06d\n", level_nr, level.game_version);
+    printf("         file_version == %06d\n", level.file_version);
+    */
+
+    for (i=0; i<ep_em_slippery_wall_num; i++)
     {
+#if 1
+      if (level.em_slippery_gems)	/* special EM style gems behaviour */
+#else
       if (game.version >= GAME_VERSION_2_0)
-	Elementeigenschaften2[ep_slippery[i]] |= EP_BIT_SLIPPERY_GEMS;
+#endif
+	Elementeigenschaften2[ep_em_slippery_wall[i]] |=
+	  EP_BIT_EM_SLIPPERY_WALL;
       else
-	Elementeigenschaften2[ep_slippery[i]] &= ~EP_BIT_SLIPPERY_GEMS;
+	Elementeigenschaften2[ep_em_slippery_wall[i]] &=
+	  ~EP_BIT_EM_SLIPPERY_WALL;
     }
   }
 
@@ -766,6 +820,9 @@ void InitGame()
 	       DX + XX_LEVEL - 1, DY + YY_LEVEL + 1);
   }
 
+#if 1
+  DrawGameDoorValues();
+#else
   DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
 	   int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW);
   DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
@@ -774,8 +831,10 @@ void InitGame()
 	   int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
   DrawText(DX + XX_TIME, DY + YY_TIME,
 	   int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+#endif
 
   UnmapGameButtons();
+  UnmapTapeButtons();
   game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music;
   game_gadget[SOUND_CTRL_ID_LOOPS]->checked = setup.sound_loops;
   game_gadget[SOUND_CTRL_ID_SIMPLE]->checked = setup.sound_simple;
@@ -788,8 +847,8 @@ void InitGame()
 
   OpenDoor(DOOR_OPEN_ALL);
 
-  if (setup.sound_music && num_bg_loops)
-    PlayMusic(level_nr % num_bg_loops);
+  if (setup.sound_music)
+    PlayMusic(level_nr);
 
   KeyboardAutoRepeatOff();
 
@@ -943,12 +1002,13 @@ void GameWon()
   if (TimeLeft)
   {
     if (!tape.playing && setup.sound_loops)
-      PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
+      PlaySoundExt(SND_GAME_LEVELTIME_BONUS, PSND_MAX_VOLUME, PSND_MAX_RIGHT,
+		   PSND_LOOP);
 
     while(TimeLeft > 0)
     {
       if (!tape.playing && !setup.sound_loops)
-	PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
+	PlaySoundStereo(SND_GAME_LEVELTIME_BONUS, PSND_MAX_RIGHT);
       if (TimeLeft > 0 && !(TimeLeft % 10))
 	RaiseScore(level.score[SC_ZEITBONUS]);
       if (TimeLeft > 100 && !(TimeLeft % 10))
@@ -963,17 +1023,18 @@ void GameWon()
     }
 
     if (!tape.playing && setup.sound_loops)
-      StopSound(SND_SIRR);
+      StopSound(SND_GAME_LEVELTIME_BONUS);
   }
   else if (level.time == 0)		/* level without time limit */
   {
     if (!tape.playing && setup.sound_loops)
-      PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
+      PlaySoundExt(SND_GAME_LEVELTIME_BONUS, PSND_MAX_VOLUME, PSND_MAX_RIGHT,
+		   PSND_LOOP);
 
     while(TimePlayed < 999)
     {
       if (!tape.playing && !setup.sound_loops)
-	PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
+	PlaySoundStereo(SND_GAME_LEVELTIME_BONUS, PSND_MAX_RIGHT);
       if (TimePlayed < 999 && !(TimePlayed % 10))
 	RaiseScore(level.score[SC_ZEITBONUS]);
       if (TimePlayed < 900 && !(TimePlayed % 10))
@@ -988,7 +1049,7 @@ void GameWon()
     }
 
     if (!tape.playing && setup.sound_loops)
-      StopSound(SND_SIRR);
+      StopSound(SND_GAME_LEVELTIME_BONUS);
   }
 
 #if 0
@@ -1268,7 +1329,7 @@ void CheckDynamite(int x, int y)
     if (MovDelay[x][y])
     {
       if (!(MovDelay[x][y] % 12))
-	PlaySoundLevel(x, y, SND_ZISCH);
+	PlaySoundLevel(x, y, SND_DYNAMITE_BURNING);
 
       if (IS_ACTIVE_BOMB(Feld[x][y]))
       {
@@ -1282,7 +1343,7 @@ void CheckDynamite(int x, int y)
     }
   }
 
-  StopSound(SND_ZISCH);
+  StopSound(SND_DYNAMITE_BURNING);
   Bang(x, y);
 }
 
@@ -1559,9 +1620,9 @@ void Bang(int x, int y)
   int element = Feld[x][y];
 
   if (game.emulation == EMU_SUPAPLEX)
-    PlaySoundLevel(x, y, SND_SP_BOOOM);
+    PlaySoundLevel(x, y, SND_SP_ELEMENT_EXPLODING);
   else
-    PlaySoundLevel(x, y, SND_ROAAAR);
+    PlaySoundLevel(x, y, SND_ELEMENT_EXPLODING);
 
 #if 0
   if (IS_PLAYER(x, y))	/* remove objects that might cause smaller explosion */
@@ -1611,7 +1672,7 @@ void Blurb(int x, int y)
 
   if (element != EL_BLURB_LEFT && element != EL_BLURB_RIGHT)	/* start */
   {
-    PlaySoundLevel(x, y, SND_BLURB);
+    PlaySoundLevel(x, y, SND_ACID_SPLASHING);
     if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) &&
 	(!IN_LEV_FIELD(x-1, y-1) ||
 	 !CAN_FALL(MovingOrBlocked2Element(x-1, y-1))))
@@ -1728,13 +1789,13 @@ static void ToggleSwitchgateSwitch(int x, int y)
 	       element == EL_SWITCHGATE_OPENING)
       {
 	Feld[xx][yy] = EL_SWITCHGATE_CLOSING;
-	PlaySoundLevel(xx, yy, SND_OEFFNEN);
+	PlaySoundLevel(xx, yy, SND_SWITCHGATE_CLOSING);
       }
       else if (element == EL_SWITCHGATE_CLOSED ||
 	       element == EL_SWITCHGATE_CLOSING)
       {
 	Feld[xx][yy] = EL_SWITCHGATE_OPENING;
-	PlaySoundLevel(xx, yy, SND_OEFFNEN);
+	PlaySoundLevel(xx, yy, SND_SWITCHGATE_OPENING);
       }
     }
   }
@@ -1798,7 +1859,7 @@ static void ActivateTimegateSwitch(int x, int y)
 	  element == EL_TIMEGATE_CLOSING)
       {
 	Feld[xx][yy] = EL_TIMEGATE_OPENING;
-	PlaySoundLevel(xx, yy, SND_OEFFNEN);
+	PlaySoundLevel(xx, yy, SND_TIMEGATE_OPENING);
       }
 
       /*
@@ -1851,7 +1912,7 @@ void Impact(int x, int y)
   else if (element == EL_PEARL)
   {
     Feld[x][y] = EL_PEARL_BREAKING;
-    PlaySoundLevel(x, y, SND_KNACK);
+    PlaySoundLevel(x, y, SND_PEARL_BREAKING);
     return;
   }
 
@@ -1938,20 +1999,20 @@ void Impact(int x, int y)
 	else if (smashed == EL_KOKOSNUSS)
 	{
 	  Feld[x][y+1] = EL_CRACKINGNUT;
-	  PlaySoundLevel(x, y, SND_KNACK);
+	  PlaySoundLevel(x, y, SND_NUT_CRACKING);
 	  RaiseScoreElement(EL_KOKOSNUSS);
 	  return;
 	}
 	else if (smashed == EL_PEARL)
 	{
 	  Feld[x][y+1] = EL_PEARL_BREAKING;
-	  PlaySoundLevel(x, y, SND_KNACK);
+	  PlaySoundLevel(x, y, SND_PEARL_BREAKING);
 	  return;
 	}
 	else if (smashed == EL_DIAMANT)
 	{
 	  Feld[x][y+1] = EL_LEERRAUM;
-	  PlaySoundLevel(x, y, SND_QUIRK);
+	  PlaySoundLevel(x, y, SND_DIAMOND_BREAKING);
 	  return;
 	}
 	else if (IS_BELT_SWITCH(smashed))
@@ -1977,7 +2038,11 @@ void Impact(int x, int y)
       (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ||
        Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
   {
-    PlaySoundLevel(x, y, SND_QUIRK);
+    if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY)
+      PlaySoundLevel(x, y, SND_MAGIC_WALL_CHANGING);
+    else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)
+      PlaySoundLevel(x, y, SND_BD_MAGIC_WALL_CHANGING);
+
     return;
   }
 
@@ -1986,41 +2051,40 @@ void Impact(int x, int y)
   {
     int sound;
 
-    switch(element)
+    switch (element)
     {
-      case EL_EDELSTEIN:
       case EL_EDELSTEIN_BD:
+        sound = SND_BD_DIAMOND_IMPACT;
+	break;
+      case EL_EDELSTEIN:
       case EL_EDELSTEIN_GELB:
       case EL_EDELSTEIN_ROT:
       case EL_EDELSTEIN_LILA:
+        sound = SND_EMERALD_IMPACT;
+	break;
       case EL_DIAMANT:
+        sound = SND_DIAMOND_IMPACT;
+	break;
       case EL_SP_INFOTRON:
-        sound = SND_PLING;
+        sound = SND_SP_INFOTRON_IMPACT;
 	break;
       case EL_KOKOSNUSS:
-	sound = SND_KLUMPF;
+	sound = SND_NUT_IMPACT;
 	break;
-      case EL_FELSBROCKEN:
       case EL_BD_ROCK:
-	sound = SND_KLOPF;
+	sound = SND_BD_ROCK_IMPACT;
 	break;
-      case EL_SP_ZONK:
-	sound = SND_SP_ZONKDOWN;
+      case EL_FELSBROCKEN:
+	sound = SND_ROCK_IMPACT;
 	break;
-      case EL_SCHLUESSEL:
-      case EL_SCHLUESSEL1:
-      case EL_SCHLUESSEL2:
-      case EL_SCHLUESSEL3:
-      case EL_SCHLUESSEL4:
-      case EL_EM_KEY_1:
-      case EL_EM_KEY_2:
-      case EL_EM_KEY_3:
-      case EL_EM_KEY_4:
-	sound = SND_KINK;
+      case EL_SP_ZONK:
+	sound = SND_SP_ZONK_IMPACT;
 	break;
       case EL_ZEIT_VOLL:
+	sound = SND_TIME_ORB_FULL_IMPACT;
+	break;
       case EL_ZEIT_LEER:
-	sound = SND_DENG;
+	sound = SND_TIME_ORB_EMPTY_IMPACT;
 	break;
       default:
 	sound = -1;
@@ -2615,7 +2679,7 @@ void StartMoving(int x, int y)
 #endif
 #else
     else if ((IS_SLIPPERY(Feld[x][y+1]) ||
-	      (IS_SLIPPERY_GEMS(Feld[x][y+1]) && IS_GEM(element))) &&
+	      (IS_EM_SLIPPERY_WALL(Feld[x][y+1]) && IS_GEM(element))) &&
 	     !IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
 	     element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
 #endif
@@ -2688,9 +2752,13 @@ void StartMoving(int x, int y)
 	if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
 	  DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(element)+phase);
 
-	if ((element == EL_MAMPFER || element == EL_MAMPFER2)
-	    && MovDelay[x][y]%4 == 3)
-	  PlaySoundLevel(x, y, SND_NJAM);
+	if (MovDelay[x][y] % 4 == 3)
+	{
+	  if (element == EL_MAMPFER)
+	    PlaySoundLevel(x, y, SND_YAMYAM_WAITING);
+	  else if (element == EL_MAMPFER2)
+	    PlaySoundLevel(x, y, SND_DARK_YAMYAM_WAITING);
+	}
       }
       else if (element == EL_SP_ELECTRON)
 	DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
@@ -2741,14 +2809,14 @@ void StartMoving(int x, int y)
 	return;
     }
 
-    if (element == EL_KAEFER || element == EL_BUTTERFLY)
-    {
-      PlaySoundLevel(x, y, SND_KLAPPER);
-    }
-    else if (element == EL_FLIEGER || element == EL_FIREFLY)
-    {
-      PlaySoundLevel(x, y, SND_ROEHR);
-    }
+    if (element == EL_KAEFER)
+      PlaySoundLevel(x, y, SND_BUG_MOVING);
+    else if (element == EL_FLIEGER)
+      PlaySoundLevel(x, y, SND_SPACESHIP_MOVING);
+    else if (element == EL_BUTTERFLY)
+      PlaySoundLevel(x, y, SND_BD_BUTTERFLY_MOVING);
+    else if (element == EL_FIREFLY)
+      PlaySoundLevel(x, y, SND_BD_FIREFLY_MOVING);
 
     /* now make next step */
 
@@ -2784,7 +2852,7 @@ void StartMoving(int x, int y)
 	Feld[x][y] = EL_LEERRAUM;
 	DrawLevelField(x, y);
 
-	PlaySoundLevel(newx, newy, SND_BUING);
+	PlaySoundLevel(newx, newy, SND_PENGUIN_ENTERING_EXIT);
 	if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
 	  DrawGraphicThruMask(SCREENX(newx), SCREENY(newy), el2gfx(element));
 
@@ -2955,7 +3023,7 @@ void StartMoving(int x, int y)
     }
 
     if (element == EL_ROBOT && IN_SCR_FIELD(x, y))
-      PlaySoundLevel(x, y, SND_SCHLURF);
+      PlaySoundLevel(x, y, SND_ROBOT_MOVING);
 
     InitMovingField(x, y, MovDir[x][y]);
   }
@@ -3272,8 +3340,9 @@ void AmoebeUmwandelnBD(int ax, int ay, int new_element)
   }
 
   if (done)
-    PlaySoundLevel(ax, ay,
-		   (new_element == EL_BD_ROCK ? SND_KLOPF : SND_PLING));
+    PlaySoundLevel(ax, ay, (new_element == EL_BD_ROCK ?
+			    SND_BD_AMOEBA_TURNING_TO_ROCK :
+			    SND_BD_AMOEBA_TURNING_TO_GEM));
 }
 
 void AmoebeWaechst(int x, int y)
@@ -3287,7 +3356,10 @@ void AmoebeWaechst(int x, int y)
 
     if (DelayReached(&sound_delay, sound_delay_value))
     {
-      PlaySoundLevel(x, y, SND_AMOEBE);
+      if (Store[x][y] == EL_AMOEBE_BD)
+	PlaySoundLevel(x, y, SND_BD_AMOEBA_GROWING);
+      else
+	PlaySoundLevel(x, y, SND_AMOEBA_GROWING);
       sound_delay_value = 30;
     }
   }
@@ -3307,7 +3379,7 @@ void AmoebeWaechst(int x, int y)
   }
 }
 
-void AmoebeSchrumpft(int x, int y)
+void AmoebaEatenByMole(int x, int y)
 {
   static unsigned long sound_delay = 0;
   static unsigned long sound_delay_value = 0;
@@ -3318,7 +3390,7 @@ void AmoebeSchrumpft(int x, int y)
 
     if (DelayReached(&sound_delay, sound_delay_value))
     {
-      PlaySoundLevel(x, y, SND_BLURB);
+      PlaySoundLevel(x, y, SND_MOLE_EATING_AMOEBA);
       sound_delay_value = 30;
     }
   }
@@ -3549,7 +3621,7 @@ void Life(int ax, int ay)
   }
 }
 
-void Ablenk(int x, int y)
+void RobotWheel(int x, int y)
 {
   if (!MovDelay[x][y])		/* next animation frame */
     MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
@@ -3562,7 +3634,7 @@ void Ablenk(int x, int y)
       if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
 	DrawGraphic(SCREENX(x), SCREENY(y), GFX_ABLENK+MovDelay[x][y]%4);
       if (!(MovDelay[x][y]%4))
-	PlaySoundLevel(x, y, SND_MIEP);
+	PlaySoundLevel(x, y, SND_ROBOT_WHEEL_RUNNING);
       return;
     }
   }
@@ -3587,7 +3659,7 @@ void TimegateWheel(int x, int y)
 	DrawGraphic(SCREENX(x), SCREENY(y),
 		    GFX_TIMEGATE_SWITCH + MovDelay[x][y]%4);
       if (!(MovDelay[x][y]%4))
-	PlaySoundLevel(x, y, SND_MIEP);
+	PlaySoundLevel(x, y, SND_TIMEGATE_WHEEL_RUNNING);
       return;
     }
   }
@@ -3694,7 +3766,7 @@ void AusgangstuerPruefen(int x, int y)
 		   (x > LEVELX(BX2) ? LEVELX(BX2) : x),
 		   y < LEVELY(BY1) ? LEVELY(BY1) :
 		   (y > LEVELY(BY2) ? LEVELY(BY2) : y),
-		   SND_OEFFNEN);
+		   SND_EXIT_OPENING);
   }
 }
 
@@ -3836,7 +3908,7 @@ static void CloseAllOpenTimegates()
       if (element == EL_TIMEGATE_OPEN || element == EL_TIMEGATE_OPENING)
       {
 	Feld[x][y] = EL_TIMEGATE_CLOSING;
-	PlaySoundLevel(x, y, SND_OEFFNEN);
+	PlaySoundLevel(x, y, SND_TIMEGATE_CLOSING);
       }
     }
   }
@@ -4123,7 +4195,7 @@ static void CheckBuggyBase(int x, int y)
 
 	  if (IS_PLAYER(xx, yy))
 	  {
-	    PlaySoundLevel(x, y, SND_SP_BUG);
+	    PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVATING);
 	    break;
 	  }
 	}
@@ -4246,6 +4318,15 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
       moved = MoveFigure(player, dx, dy);
     }
 
+    if (tape.single_step && tape.recording && !tape.pausing)
+    {
+      if (button1 || (bombed && !moved))
+      {
+	TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+	SnapField(player, 0, 0);		/* stop snapping */
+      }
+    }
+
 #if 0
     if (tape.recording && (moved || snapped || bombed))
     {
@@ -4353,6 +4434,9 @@ void GameActions()
   action_delay_value =
     (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
 
+  if (tape.playing && tape.index_search && !tape.pausing)
+    action_delay_value = 0;
+
   /* ---------- main game synchronization point ---------- */
 
   WaitUntilDelayReached(&action_delay, action_delay_value);
@@ -4387,11 +4471,6 @@ void GameActions()
   if (tape.pausing)
     return;
 
-  if (tape.playing)
-    TapePlayDelay();
-  else if (tape.recording)
-    TapeRecordDelay();
-
   recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
   for (i=0; i<MAX_PLAYERS; i++)
@@ -4502,15 +4581,17 @@ void GameActions()
     else if (element == EL_AMOEBING)
       AmoebeWaechst(x, y);
     else if (element == EL_DEAMOEBING)
-      AmoebeSchrumpft(x, y);
-#if 0
+      AmoebaEatenByMole(x, y);
+
+#if !USE_NEW_AMOEBA_CODE
     else if (IS_AMOEBALIVE(element))
       AmoebeAbleger(x, y);
 #endif
+
     else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
       Life(x, y);
     else if (element == EL_ABLENK_EIN)
-      Ablenk(x, y);
+      RobotWheel(x, y);
     else if (element == EL_TIMEGATE_SWITCH_ON)
       TimegateWheel(x, y);
     else if (element == EL_SALZSAEURE)
@@ -4590,8 +4671,8 @@ void GameActions()
     }
   }
 
-#if 1
-  /* new experimental amoeba growth stuff*/
+#if USE_NEW_AMOEBA_CODE
+  /* new experimental amoeba growth stuff */
 #if 1
   if (!(FrameCounter % 8))
 #endif
@@ -4652,7 +4733,16 @@ void GameActions()
   if (game.magic_wall_active)
   {
     if (!(game.magic_wall_time_left % 4))
-      PlaySoundLevel(sieb_x, sieb_y, SND_MIEP);
+    {
+      int element = Feld[sieb_x][sieb_y];
+
+      if (element == EL_MAGIC_WALL_BD_FULL ||
+	  element == EL_MAGIC_WALL_BD_EMPTY ||
+	  element == EL_MAGIC_WALL_BD_EMPTYING)
+	PlaySoundLevel(sieb_x, sieb_y, SND_BD_MAGIC_WALL_RUNNING);
+      else
+	PlaySoundLevel(sieb_x, sieb_y, SND_MAGIC_WALL_RUNNING);
+    }
 
     if (game.magic_wall_time_left > 0)
     {
@@ -4737,7 +4827,7 @@ void GameActions()
       TimeLeft--;
 
       if (TimeLeft <= 10 && setup.time_limit)
-	PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+	PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, PSND_MAX_RIGHT);
 
       DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
 
@@ -4944,7 +5034,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     return FALSE;
 #else
   if (!FrameReached(&player->move_delay, player->move_delay_value) &&
-      !(tape.playing && tape.file_version < FILE_VERSION_2_0))
+      !(tape.playing && tape.game_version < GAME_VERSION_2_0))
     return FALSE;
 #endif
 
@@ -5151,6 +5241,10 @@ void ScrollFigure(struct PlayerInfo *player, int mode)
       if (!local_player->friends_still_needed)
 	player->LevelSolved = player->GameOver = TRUE;
     }
+
+    if (tape.single_step && tape.recording && !tape.pausing &&
+	!player->programmed_action)
+      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
   }
 }
 
@@ -5438,8 +5532,8 @@ void BuryHero(struct PlayerInfo *player)
   if (!player->active)
     return;
 
-  PlaySoundLevel(jx, jy, SND_AUTSCH);
-  PlaySoundLevel(jx, jy, SND_LACHEN);
+  PlaySoundLevel(jx, jy, SND_PLAYER_DYING);
+  PlaySoundLevel(jx, jy, SND_GAME_LOSING);
 
   player->GameOver = TRUE;
   RemoveHero(player);
@@ -5526,20 +5620,24 @@ int DigField(struct PlayerInfo *player,
   switch (element)
   {
     case EL_LEERRAUM:
-      PlaySoundLevel(x, y, SND_EMPTY);
-      break;
-
     case EL_ERDREICH:
     case EL_SAND_INVISIBLE:
     case EL_TRAP_INACTIVE:
-      Feld[x][y] = EL_LEERRAUM;
-      PlaySoundLevel(x, y, SND_SCHLURF);
-      break;
-
     case EL_SP_BASE:
     case EL_SP_BUG:
       Feld[x][y] = EL_LEERRAUM;
-      PlaySoundLevel(x, y, SND_SP_BASE);
+      if (element == EL_LEERRAUM)
+	PlaySoundLevel(x, y, SND_EMPTY_SPACE_DIGGING);
+      else if (element == EL_ERDREICH)
+	PlaySoundLevel(x, y, SND_SAND_DIGGING);
+      else if (element == EL_SAND_INVISIBLE)
+	PlaySoundLevel(x, y, SND_SAND_INVISIBLE_DIGGING);
+      else if (element == EL_TRAP_INACTIVE)
+	PlaySoundLevel(x, y, SND_TRAP_INACTIVE_DIGGING);
+      else if (element == EL_SP_BASE)
+	PlaySoundLevel(x, y, SND_SP_BASE_DIGGING);
+      else if (element == EL_SP_BUG)
+	PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_DIGGING);
       break;
 
     case EL_EDELSTEIN:
@@ -5561,21 +5659,30 @@ int DigField(struct PlayerInfo *player,
       DrawText(DX_EMERALDS, DY_EMERALDS,
 	       int2str(local_player->gems_still_needed, 3),
 	       FS_SMALL, FC_YELLOW);
-      if (element == EL_SP_INFOTRON)
-	PlaySoundLevel(x, y, SND_SP_INFOTRON);
-      else
-	PlaySoundLevel(x, y, SND_PONG);
+
+      if (element == EL_EDELSTEIN_BD)
+	PlaySoundLevel(x, y, SND_BD_DIAMOND_COLLECTING);
+      else if (element == EL_DIAMANT)
+	PlaySoundLevel(x, y, SND_DIAMOND_COLLECTING);
+      else if (element == EL_SP_INFOTRON)
+	PlaySoundLevel(x, y, SND_SP_INFOTRON_COLLECTING);
+      else if (element == EL_PEARL)
+	PlaySoundLevel(x, y, SND_PEARL_COLLECTING);
+      else if (element == EL_CRYSTAL)
+	PlaySoundLevel(x, y, SND_CRYSTAL_COLLECTING);
+      else	/* EL_EDELSTEIN style element */
+	PlaySoundLevel(x, y, SND_EMERALD_COLLECTING);
       break;
 
     case EL_SPEED_PILL:
       RemoveField(x, y);
       player->move_delay_value = MOVE_DELAY_HIGH_SPEED;
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_SPEED_PILL_COLLECTING);
       break;
 
     case EL_ENVELOPE:
       Feld[x][y] = EL_LEERRAUM;
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_ENVELOPE_COLLECTING);
       break;
 
     case EL_EXTRA_TIME:
@@ -5585,20 +5692,20 @@ int DigField(struct PlayerInfo *player,
 	TimeLeft += 10;
 	DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
       }
-      PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+      PlaySoundStereo(SND_EXTRA_TIME_COLLECTING, PSND_MAX_RIGHT);
       break;
 
     case EL_SHIELD_PASSIVE:
       RemoveField(x, y);
       player->shield_passive_time_left += 10;
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_SHIELD_PASSIVE_COLLECTING);
       break;
 
     case EL_SHIELD_ACTIVE:
       RemoveField(x, y);
       player->shield_passive_time_left += 10;
       player->shield_active_time_left += 10;
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_SHIELD_ACTIVE_COLLECTING);
       break;
 
     case EL_DYNAMITE_INACTIVE:
@@ -5610,9 +5717,9 @@ int DigField(struct PlayerInfo *player,
 	       int2str(local_player->dynamite, 3),
 	       FS_SMALL, FC_YELLOW);
       if (element == EL_SP_DISK_RED)
-	PlaySoundLevel(x, y, SND_SP_INFOTRON);
+	PlaySoundLevel(x, y, SND_SP_DISK_RED_COLLECTING);
       else
-	PlaySoundLevel(x, y, SND_PONG);
+	PlaySoundLevel(x, y, SND_DYNAMITE_COLLECTING);
       break;
 
     case EL_DYNABOMB_NR:
@@ -5620,21 +5727,21 @@ int DigField(struct PlayerInfo *player,
       player->dynabomb_count++;
       player->dynabombs_left++;
       RaiseScoreElement(EL_DYNAMITE_INACTIVE);
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_DYNABOMB_NR_COLLECTING);
       break;
 
     case EL_DYNABOMB_SZ:
       RemoveField(x, y);
       player->dynabomb_size++;
       RaiseScoreElement(EL_DYNAMITE_INACTIVE);
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_DYNABOMB_SZ_COLLECTING);
       break;
 
     case EL_DYNABOMB_XL:
       RemoveField(x, y);
       player->dynabomb_xl = TRUE;
       RaiseScoreElement(EL_DYNAMITE_INACTIVE);
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_DYNABOMB_XL_COLLECTING);
       break;
 
     case EL_SCHLUESSEL1:
@@ -5651,7 +5758,7 @@ int DigField(struct PlayerInfo *player,
 			 GFX_SCHLUESSEL1 + key_nr);
       DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
 			 GFX_SCHLUESSEL1 + key_nr);
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_KEY_COLLECTING);
       break;
     }
 
@@ -5669,7 +5776,7 @@ int DigField(struct PlayerInfo *player,
 			 GFX_SCHLUESSEL1 + key_nr);
       DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
 			 GFX_SCHLUESSEL1 + key_nr);
-      PlaySoundLevel(x, y, SND_PONG);
+      PlaySoundLevel(x, y, SND_KEY_COLLECTING);
       break;
     }
 
@@ -5768,7 +5875,7 @@ int DigField(struct PlayerInfo *player,
 	return MF_NO_ACTION;
 
       player->LevelSolved = player->GameOver = TRUE;
-      PlaySoundStereo(SND_SP_EXIT, PSND_MAX_RIGHT);
+      PlaySoundStereo(SND_SP_EXIT_ENTERING, PSND_MAX_RIGHT);
       break;
 
     case EL_FELSBROCKEN:
@@ -5802,7 +5909,7 @@ int DigField(struct PlayerInfo *player,
 	return MF_NO_ACTION;
 #else
       if (!FrameReached(&player->push_delay, player->push_delay_value) &&
-	  !(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
+	  !(tape.playing && tape.game_version < GAME_VERSION_2_0) &&
 	  element != EL_SPRING)
 	return MF_NO_ACTION;
 #endif
@@ -5819,14 +5926,24 @@ int DigField(struct PlayerInfo *player,
       player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));
 
       DrawLevelField(x+dx, y+dy);
-      if (element == EL_FELSBROCKEN || element == EL_BD_ROCK)
-	PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
+      if (element == EL_FELSBROCKEN)
+	PlaySoundLevel(x+dx, y+dy, SND_ROCK_PUSHING);
+      else if (element == EL_BD_ROCK)
+	PlaySoundLevel(x+dx, y+dy, SND_BD_ROCK_PUSHING);
+      else if (element == EL_BOMBE)
+	PlaySoundLevel(x+dx, y+dy, SND_BOMB_PUSHING);
+      else if (element == EL_DX_SUPABOMB)
+	PlaySoundLevel(x+dx, y+dy, SND_DX_BOMB_PUSHING);
       else if (element == EL_KOKOSNUSS)
-	PlaySoundLevel(x+dx, y+dy, SND_KNURK);
-      else if (IS_SP_ELEMENT(element))
-	PlaySoundLevel(x+dx, y+dy, SND_SP_ZONKPUSH);
-      else
-	PlaySoundLevel(x+dx, y+dy, SND_PUSCH);	/* better than "SND_KLOPF" */
+	PlaySoundLevel(x+dx, y+dy, SND_NUT_PUSHING);
+      else if (element == EL_ZEIT_LEER)
+	PlaySoundLevel(x+dx, y+dy, SND_TIME_ORB_EMPTY_PUSHING);
+      else if (element == EL_SP_ZONK)
+	PlaySoundLevel(x+dx, y+dy, SND_SP_ZONK_PUSHING);
+      else if (element == EL_SP_DISK_ORANGE)
+	PlaySoundLevel(x+dx, y+dy, SND_SP_DISK_ORANGE_PUSHING);
+      else if (element == EL_SPRING)
+	PlaySoundLevel(x+dx, y+dy, SND_SPRING_PUSHING);
       break;
 
     case EL_PFORTE1:
@@ -5858,7 +5975,7 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-      PlaySoundLevel(x, y, SND_GATE);
+      PlaySoundLevel(x, y, SND_GATE_PASSING);
 
       break;
 
@@ -5875,7 +5992,7 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-      PlaySoundLevel(x, y, SND_GATE);
+      PlaySoundLevel(x, y, SND_GATE_PASSING);
 
       break;
 
@@ -5888,7 +6005,10 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-      PlaySoundLevel(x, y, SND_GATE);
+      if (element == EL_SWITCHGATE_OPEN)
+	PlaySoundLevel(x, y, SND_SWITCHGATE_PASSING);
+      else
+	PlaySoundLevel(x, y, SND_TIMEGATE_PASSING);
 
       break;
 
@@ -5931,7 +6051,7 @@ int DigField(struct PlayerInfo *player,
       player->programmed_action = move_direction;
       DOUBLE_PLAYER_SPEED(player);
 
-      PlaySoundLevel(x, y, SND_GATE);
+      PlaySoundLevel(x, y, SND_SP_PORT_PASSING);
       break;
 
     case EL_TUBE_CROSS:
@@ -5985,7 +6105,7 @@ int DigField(struct PlayerInfo *player,
       if (mode == DF_SNAP)
 	return MF_NO_ACTION;
 
-      PlaySoundLevel(x, y, SND_BUING);
+      PlaySoundLevel(x, y, SND_EXIT_ENTERING);
 
       break;
 
@@ -5993,7 +6113,7 @@ int DigField(struct PlayerInfo *player,
       Feld[x][y] = EL_BIRNE_EIN;
       local_player->lights_still_needed--;
       DrawLevelField(x, y);
-      PlaySoundLevel(x, y, SND_DENG);
+      PlaySoundLevel(x, y, SND_LAMP_ACTIVATING);
       return MF_ACTION;
       break;
 
@@ -6002,15 +6122,15 @@ int DigField(struct PlayerInfo *player,
       TimeLeft += 10;
       DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
       DrawLevelField(x, y);
-      PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+      PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, PSND_MAX_RIGHT);
       return MF_ACTION;
       break;
 
     case EL_SOKOBAN_FELD_LEER:
       break;
 
-    case EL_SOKOBAN_FELD_VOLL:
     case EL_SOKOBAN_OBJEKT:
+    case EL_SOKOBAN_FELD_VOLL:
     case EL_SONDE:
     case EL_SP_DISK_YELLOW:
     case EL_BALLOON:
@@ -6044,7 +6164,7 @@ int DigField(struct PlayerInfo *player,
 	return MF_NO_ACTION;
 #else
       if (!FrameReached(&player->push_delay, player->push_delay_value) &&
-	  !(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
+	  !(tape.playing && tape.game_version < GAME_VERSION_2_0) &&
 	  element != EL_BALLOON)
 	return MF_NO_ACTION;
 #endif
@@ -6064,10 +6184,18 @@ int DigField(struct PlayerInfo *player,
 	  Feld[x+dx][y+dy] = EL_SOKOBAN_FELD_VOLL;
 	  local_player->sokobanfields_still_needed--;
 	  if (element == EL_SOKOBAN_OBJEKT)
-	    PlaySoundLevel(x, y, SND_DENG);
+	    PlaySoundLevel(x, y, SND_SOKOBAN_FIELD_FILLING);
+	  else
+	    PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING);
 	}
 	else
+	{
 	  Feld[x+dx][y+dy] = EL_SOKOBAN_OBJEKT;
+	  if (element == EL_SOKOBAN_FELD_VOLL)
+	    PlaySoundLevel(x, y, SND_SOKOBAN_FIELD_CLEARING);
+	  else
+	    PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING);
+	}
       }
       else
       {
@@ -6079,17 +6207,19 @@ int DigField(struct PlayerInfo *player,
 
       DrawLevelField(x, y);
       DrawLevelField(x+dx, y+dy);
-      if (element == EL_BALLOON)
-	PlaySoundLevel(x+dx, y+dy, SND_SCHLURF);
-      else
-	PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
+      if (element == EL_SONDE)
+	PlaySoundLevel(x+dx, y+dy, SND_SATELLITE_PUSHING);
+      else if (element == EL_SP_DISK_YELLOW)
+	PlaySoundLevel(x+dx, y+dy, SND_SP_DISK_YELLOW_PUSHING);
+      else if (element == EL_BALLOON)
+	PlaySoundLevel(x+dx, y+dy, SND_BALLOON_PUSHING);
 
       if (IS_SB_ELEMENT(element) &&
 	  local_player->sokobanfields_still_needed == 0 &&
 	  game.emulation == EMU_SOKOBAN)
       {
 	player->LevelSolved = player->GameOver = TRUE;
-	PlaySoundLevel(x, y, SND_BUING);
+	PlaySoundLevel(x, y, SND_SOKOBAN_GAME_SOLVING);
       }
 
       break;
@@ -6278,6 +6408,31 @@ void RaiseScoreElement(int element)
   }
 }
 
+void RequestQuitGame(boolean ask_if_really_quit)
+{
+  if (AllPlayersGone ||
+      !ask_if_really_quit ||
+      level_editor_test_game ||
+      Request("Do you really want to quit the game ?",
+	      REQ_ASK | REQ_STAY_CLOSED))
+  {
+#if defined(PLATFORM_UNIX)
+    if (options.network)
+      SendToServer_StopPlaying();
+    else
+#endif
+    {
+      game_status = MAINMENU;
+      DrawMainMenu();
+    }
+  }
+  else
+  {
+    OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+  }
+}
+
+
 /* ---------- new game button stuff ---------------------------------------- */
 
 /* graphic position values for game buttons */
@@ -6426,30 +6581,7 @@ static void HandleGameButtons(struct GadgetInfo *gi)
   switch (id)
   {
     case GAME_CTRL_ID_STOP:
-      if (AllPlayersGone)
-      {
-	CloseDoor(DOOR_CLOSE_1);
-	game_status = MAINMENU;
-	DrawMainMenu();
-	break;
-      }
-
-      if (level_editor_test_game ||
-	  Request("Do you really want to quit the game ?",
-		  REQ_ASK | REQ_STAY_CLOSED))
-      { 
-#if defined(PLATFORM_UNIX)
-	if (options.network)
-	  SendToServer_StopPlaying();
-	else
-#endif
-	{
-	  game_status = MAINMENU;
-	  DrawMainMenu();
-	}
-      }
-      else
-	OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+      RequestQuitGame(TRUE);
       break;
 
     case GAME_CTRL_ID_PAUSE:
@@ -6463,7 +6595,7 @@ static void HandleGameButtons(struct GadgetInfo *gi)
 #endif
       }
       else
-	TapeTogglePause();
+	TapeTogglePause(TAPE_TOGGLE_MANUAL);
       break;
 
     case GAME_CTRL_ID_PLAY:
@@ -6487,11 +6619,10 @@ static void HandleGameButtons(struct GadgetInfo *gi)
 	setup.sound_music = FALSE;
 	FadeMusic();
       }
-      else if (audio.loops_available)
+      else if (audio.music_available)
       { 
 	setup.sound = setup.sound_music = TRUE;
-	if (num_bg_loops)
-	  PlayMusic(level_nr % num_bg_loops);
+	PlayMusic(level_nr);
       }
       break;