X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame.c;h=15c379531fc488fc94a14f84cc5b0c02b7d6cc5e;hp=8d88167b277ece9f7ddce9e0ebfcd0a030f523aa;hb=cf5b3a1e9077e88eb40ce2fb59e985a0ae037c84;hpb=c3d03cdffce070695ba0520d00667b42b8460087

diff --git a/src/game.c b/src/game.c
index 8d88167b..15c37953 100644
--- a/src/game.c
+++ b/src/game.c
@@ -20,6 +20,12 @@
 #include "init.h"
 #include "buttons.h"
 #include "files.h"
+#include "tape.h"
+#include "joystick.h"
+
+extern int Gamespeed;
+extern int Movemethod;
+extern int Movespeed[2];
 
 void GetPlayerConfig()
 {
@@ -33,15 +39,16 @@ void GetPlayerConfig()
     player.setup &= ~SETUP_SOUND_MUSIC;
   }
 
-  sound_on = SETUP_SOUND_ON(player.setup);
+  sound_on = sound_simple_on = SETUP_SOUND_ON(player.setup);
   sound_loops_on = SETUP_SOUND_LOOPS_ON(player.setup);
   sound_music_on = SETUP_SOUND_MUSIC_ON(player.setup);
   toons_on = SETUP_TOONS_ON(player.setup);
   direct_draw_on = SETUP_DIRECT_DRAW_ON(player.setup);
   fading_on = SETUP_FADING_ON(player.setup);
-  autorecord_on = SETUP_RECORD_EACH_GAME_ON(player.setup);
+  autorecord_on = SETUP_AUTO_RECORD_ON(player.setup);
   joystick_nr = SETUP_2ND_JOYSTICK_ON(player.setup);
   quick_doors = SETUP_QUICK_DOORS_ON(player.setup);
+  scroll_delay_on = SETUP_SCROLL_DELAY_ON(player.setup);
 
   if (joystick_nr != old_joystick_nr)
   {
@@ -54,34 +61,43 @@ void GetPlayerConfig()
 void InitGame()
 {
   int i,x,y;
+  BOOL emulate_bd = TRUE;	/* unless non-BOULDERDASH elements found */
+  BOOL emulate_sb = TRUE;	/* unless non-SOKOBAN     elements found */
 
   Dynamite = Score = 0;
   Gems = level.edelsteine;
+  SokobanFields = Lights = Friends = 0;
+  DynaBombCount = DynaBombSize = DynaBombsLeft = 0;
+  DynaBombXL = FALSE;
   Key[0] = Key[1] = Key[2] = Key[3] = FALSE;
   MampferNr = 0;
+  FrameCounter = 0;
+  TimeFrames = 0;
   TimeLeft = level.time;
-  CheckMoving = TRUE;
-  CheckExploding = FALSE;
-  LevelSolved = GameOver = SiebAktiv = FALSE;
+  PlayerMovDir = MV_NO_MOVING;
+  PlayerFrame = 0;
+  PlayerPushing = FALSE;
+  PlayerGone = LevelSolved = GameOver = SiebAktiv = FALSE;
   JX = JY = 0;
   ZX = ZY = -1;
 
-  if (tape.recording)
-    TapeStartRecording();
-  else if (tape.playing)
-    TapeStartPlaying();
-
-  DigField(0,0,DF_NO_PUSH);
+  DigField(0,0,0,0,DF_NO_PUSH);
   SnapField(0,0);
 
   for(i=0;i<MAX_NUM_AMOEBA;i++)
-    AmoebaCnt[i] = 0;
+    AmoebaCnt[i] = AmoebaCnt2[i] = 0;
 
   for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
   {
     Feld[x][y] = Ur[x][y];
     MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
     Store[x][y] = Store2[x][y] = Frame[x][y] = AmoebaNr[x][y] = 0;
+    JustHit[x][y] = 0;
+
+    if (emulate_bd && !IS_BD_ELEMENT(Feld[x][y]))
+      emulate_bd = FALSE;
+    if (emulate_sb && !IS_SB_ELEMENT(Feld[x][y]))
+      emulate_sb = FALSE;
 
     switch(Feld[x][y])
     {
@@ -116,16 +132,28 @@ void InitGame()
       case EL_FLIEGER_L:
       case EL_FLIEGER_U:
       case EL_FLIEGER:
+      case EL_BUTTERFLY_R:
+      case EL_BUTTERFLY_O:
+      case EL_BUTTERFLY_L:
+      case EL_BUTTERFLY_U:
+      case EL_BUTTERFLY:
+      case EL_FIREFLY_R:
+      case EL_FIREFLY_O:
+      case EL_FIREFLY_L:
+      case EL_FIREFLY_U:
+      case EL_FIREFLY:
       case EL_PACMAN_R:
       case EL_PACMAN_O:
       case EL_PACMAN_L:
       case EL_PACMAN_U:
       case EL_MAMPFER:
-      case EL_ZOMBIE:
+      case EL_MAMPFER2:
+      case EL_ROBOT:
       case EL_PACMAN:
 	InitMovDir(x,y);
 	break;
       case EL_AMOEBE_VOLL:
+      case EL_AMOEBE_BD:
 	InitAmoebaNr(x,y);
 	break;
       case EL_TROPFEN:
@@ -135,11 +163,31 @@ void InitGame()
 	  Store[x][y] = EL_AMOEBE_NASS;
 	}
 	break;
+      case EL_DYNAMIT:
+	MovDelay[x][y] = 48;
+	break;
+      case EL_BIRNE_AUS:
+	Lights++;
+	break;
+      case EL_SOKOBAN_FELD_LEER:
+	SokobanFields++;
+	break;
+      case EL_MAULWURF:
+      case EL_PINGUIN:
+	Friends++;
+	break;
+      case EL_SCHWEIN:
+      case EL_DRACHE:
+	MovDir[x][y] = 1<<RND(4);
+	break;
       default:
 	break;
     }
   }
 
+  game_emulation = (emulate_bd ? EMU_BOULDERDASH :
+		    emulate_sb ? EMU_SOKOBAN : EMU_NONE);
+
   scroll_x = scroll_y = -1;
   if (JX>=MIDPOSX-1)
     scroll_x =
@@ -148,6 +196,8 @@ void InitGame()
     scroll_y =
       (JY<=lev_fieldy-MIDPOSY ? JY-MIDPOSY : lev_fieldy-SCR_FIELDY+1);
 
+  CloseDoor(DOOR_CLOSE_1);
+
   DrawLevel();
   DrawLevelElement(JX,JY,EL_SPIELFIGUR);
   FadeToFront();
@@ -174,9 +224,9 @@ void InitGame()
   DrawGameButton(BUTTON_GAME_STOP);
   DrawGameButton(BUTTON_GAME_PAUSE);
   DrawGameButton(BUTTON_GAME_PLAY);
-  DrawSoundDisplay(BUTTON_SOUND_MUSIC | (BUTTON_ON * sound_music_on));
-  DrawSoundDisplay(BUTTON_SOUND_LOOPS | (BUTTON_ON * sound_loops_on));
-  DrawSoundDisplay(BUTTON_SOUND_SOUND | (BUTTON_ON * sound_on));
+  DrawSoundDisplay(BUTTON_SOUND_MUSIC  | (BUTTON_ON * sound_music_on));
+  DrawSoundDisplay(BUTTON_SOUND_LOOPS  | (BUTTON_ON * sound_loops_on));
+  DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (BUTTON_ON * sound_simple_on));
   XCopyArea(display,drawto,pix[PIX_DB_DOOR],gc,
 	    DX+GAME_CONTROL_XPOS,DY+GAME_CONTROL_YPOS,
 	    GAME_CONTROL_XSIZE,2*GAME_CONTROL_YSIZE,
@@ -196,15 +246,15 @@ void InitMovDir(int x, int y)
   int i, element = Feld[x][y];
   static int xy[4][2] =
   {
-    0,+1,
-    +1,0,
-    0,-1,
-    -1,0
+    { 0,+1 },
+    { +1,0 },
+    { 0,-1 },
+    { -1,0 }
   };
   static int direction[2][4] =
   {
-    MV_RIGHT, MV_UP,   MV_LEFT,  MV_DOWN,
-    MV_LEFT,  MV_DOWN, MV_RIGHT, MV_UP
+    { MV_RIGHT, MV_UP,   MV_LEFT,  MV_DOWN },
+    { MV_LEFT,  MV_DOWN, MV_RIGHT, MV_UP }
   };
 
   switch(element)
@@ -223,6 +273,20 @@ void InitMovDir(int x, int y)
       Feld[x][y] = EL_FLIEGER;
       MovDir[x][y] = direction[0][element-EL_FLIEGER_R];
       break;
+    case EL_BUTTERFLY_R:
+    case EL_BUTTERFLY_O:
+    case EL_BUTTERFLY_L:
+    case EL_BUTTERFLY_U:
+      Feld[x][y] = EL_BUTTERFLY;
+      MovDir[x][y] = direction[0][element-EL_BUTTERFLY_R];
+      break;
+    case EL_FIREFLY_R:
+    case EL_FIREFLY_O:
+    case EL_FIREFLY_L:
+    case EL_FIREFLY_U:
+      Feld[x][y] = EL_FIREFLY;
+      MovDir[x][y] = direction[0][element-EL_FIREFLY_R];
+      break;
     case EL_PACMAN_R:
     case EL_PACMAN_O:
     case EL_PACMAN_L:
@@ -232,7 +296,10 @@ void InitMovDir(int x, int y)
       break;
     default:
       MovDir[x][y] = 1<<RND(4);
-      if (element!=EL_KAEFER && element!=EL_FLIEGER)
+      if (element != EL_KAEFER &&
+	  element != EL_FLIEGER &&
+	  element != EL_BUTTERFLY &&
+	  element != EL_FIREFLY)
 	break;
 
       for(i=0;i<4;i++)
@@ -244,12 +311,12 @@ void InitMovDir(int x, int y)
 
 	if (!IN_LEV_FIELD(x1,y1) || !IS_FREE(x1,y1))
 	{
-	  if (element==EL_KAEFER)
+	  if (element==EL_KAEFER || element==EL_BUTTERFLY)
 	  {
 	    MovDir[x][y] = direction[0][i];
 	    break;
 	  }
-	  else if (element==EL_FLIEGER)
+	  else if (element==EL_FLIEGER || element==EL_FIREFLY)
 	  {
 	    MovDir[x][y] = direction[1][i];
 	    break;
@@ -279,6 +346,7 @@ void InitAmoebaNr(int x, int y)
 
   AmoebaNr[x][y] = group_nr;
   AmoebaCnt[group_nr]++;
+  AmoebaCnt2[group_nr]++;
 }
 
 void GameWon()
@@ -286,34 +354,51 @@ void GameWon()
   int hi_pos;
   int bumplevel = FALSE;
 
-  if (sound_loops_on)
-    PlaySoundExt(SND_SIRR,PSND_MAX_VOLUME,PSND_MAX_RIGHT,PSND_LOOP);
+  LevelSolved = FALSE;
 
-  if (TimeLeft>0) 
+  if (TimeLeft)
   {
-    for(;TimeLeft>=0;TimeLeft--)
+    if (sound_loops_on)
+      PlaySoundExt(SND_SIRR,PSND_MAX_VOLUME,PSND_MAX_RIGHT,PSND_LOOP);
+
+    while(TimeLeft>0)
     {
       if (!sound_loops_on)
 	PlaySoundStereo(SND_SIRR,PSND_MAX_RIGHT);
       if (TimeLeft && !(TimeLeft % 10))
 	RaiseScore(level.score[SC_ZEITBONUS]);
+      if (TimeLeft > 100 && !(TimeLeft % 10))
+	TimeLeft -= 10;
+      else
+	TimeLeft--;
       DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
       BackToFront();
       Delay(10000);
     }
+
+    if (sound_loops_on)
+      StopSound(SND_SIRR);
   }
 
-  if (sound_loops_on)
-    StopSound(SND_SIRR);
   FadeSounds();
 
+  /* Hero disappears */
+  DrawLevelElement(ExitX,ExitY,Feld[ExitX][ExitY]);
+  BackToFront();
+
   if (tape.playing)
     return;
 
   CloseDoor(DOOR_CLOSE_1);
 
+  if (tape.recording)
+  {
+    TapeStop();
+    SaveLevelTape(tape.level_nr);	/* Ask to save tape */
+  }
+
   if (level_nr==player.handicap &&
-      level_nr<leveldir[leveldir_nr].num_ready) 
+      level_nr<leveldir[leveldir_nr].levels-1)
   { 
     player.handicap++; 
     bumplevel = TRUE;
@@ -334,6 +419,7 @@ void GameWon()
       level_nr++;
     DrawMainMenu();
   }
+
   BackToFront();
 }
 
@@ -398,7 +484,6 @@ void InitMovingField(int x, int y, int direction)
   int newx = x + (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0);
   int newy = y + (direction==MV_UP   ? -1 : direction==MV_DOWN  ? +1 : 0);
 
-  CheckMoving = TRUE;
   MovDir[x][y] = direction;
   MovDir[newx][newy] = direction;
   if (Feld[newx][newy]==EL_LEERRAUM)
@@ -450,15 +535,15 @@ int MovingOrBlocked2Element(int x, int y)
 
 void RemoveMovingField(int x, int y)
 {
-  int oldx=x,oldy=y, newx=x,newy=y;
+  int oldx = x,oldy = y, newx = x,newy = y;
 
-  if (Feld[x][y]!=EL_BLOCKED && !IS_MOVING(x,y))
+  if (Feld[x][y] != EL_BLOCKED && !IS_MOVING(x,y))
     return;
 
   if (IS_MOVING(x,y))
   {
     Moving2Blocked(x,y,&newx,&newy);
-    if (Feld[newx][newy]!=EL_BLOCKED)
+    if (Feld[newx][newy] != EL_BLOCKED)
       return;
   }
   else if (Feld[x][y]==EL_BLOCKED)
@@ -468,53 +553,69 @@ void RemoveMovingField(int x, int y)
       return;
   }
 
-  Feld[oldx][oldy] = EL_LEERRAUM;
+  if (Feld[x][y]==EL_BLOCKED &&
+      (Store[oldx][oldy]==EL_MORAST_LEER ||
+       Store[oldx][oldy]==EL_SIEB_LEER ||
+       Store[oldx][oldy]==EL_SIEB2_LEER ||
+       Store[oldx][oldy]==EL_AMOEBE_NASS))
+  {
+    Feld[oldx][oldy] = Store[oldx][oldy];
+    Store[oldx][oldy] = Store2[oldx][oldy] = 0;
+  }
+  else
+    Feld[oldx][oldy] = EL_LEERRAUM;
+
   Feld[newx][newy] = EL_LEERRAUM;
   MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0;
   MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0;
+
   DrawLevelField(oldx,oldy);
   DrawLevelField(newx,newy);
 }
 
 void DrawDynamite(int x, int y)
 {
-  int phase = (48-MovDelay[x][y])/6;
+  int sx = SCROLLX(x), sy = SCROLLY(y);
+  int graphic = el2gfx(Feld[x][y]);
+  int phase;
 
-  if (!IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+  if (!IN_SCR_FIELD(sx,sy) || IS_PLAYER(x,y))
     return;
 
-  if (phase>6)
-    phase = 6;
-
   if (Store[x][y])
+    DrawGraphic(sx,sy, el2gfx(Store[x][y]));
+
+  if (Feld[x][y]==EL_DYNAMIT)
   {
-    DrawGraphic(SCROLLX(x),SCROLLY(y),el2gfx(Store[x][y]));
-    if (PLAYER(x,y))
-      DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_SPIELFIGUR);
+    if ((phase = (48-MovDelay[x][y])/6) > 6)
+      phase = 6;
+  }
+  else
+  {
+    if ((phase = ((48-MovDelay[x][y])/3) % 8) > 3)
+      phase = 7-phase;
   }
-  else if (PLAYER(x,y))
-    DrawGraphic(SCROLLX(JX),SCROLLY(JY),GFX_SPIELFIGUR);
 
-  if (Store[x][y] || PLAYER(x,y))
-    DrawGraphicThruMask(SCROLLX(x),SCROLLY(y),GFX_DYNAMIT+phase);
+  if (Store[x][y])
+    DrawGraphicThruMask(sx,sy, graphic + phase);
   else
-    DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_DYNAMIT+phase);
+    DrawGraphic(sx,sy, graphic + phase);
 }
 
 void CheckDynamite(int x, int y)
 {
-  CheckExploding=TRUE;
-
   if (MovDelay[x][y])		/* neues Dynamit / in Wartezustand */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y])
     {
       if (!(MovDelay[x][y] % 6))
-      {
-	DrawDynamite(x,y);
 	PlaySoundLevel(x,y,SND_ZISCH);
-      }
+
+      if (Feld[x][y]==EL_DYNAMIT && !(MovDelay[x][y] % 6))
+	DrawDynamite(x,y);
+      else if (Feld[x][y]==EL_DYNABOMB && !(MovDelay[x][y] % 3))
+	DrawDynamite(x,y);
 
       return;
     }
@@ -524,7 +625,7 @@ void CheckDynamite(int x, int y)
   Bang(x,y);
 }
 
-void Explode(int ex, int ey, int phase)
+void Explode(int ex, int ey, int phase, int mode)
 {
   int x,y;
   int num_phase = 9, delay = 1;
@@ -535,24 +636,42 @@ void Explode(int ex, int ey, int phase)
   {
     int center_element = Feld[ex][ey];
 
-    if (center_element==EL_BLOCKED)
+    if (IS_MOVING(ex,ey) || IS_BLOCKED(ex,ey))
+    {
       center_element = MovingOrBlocked2Element(ex,ey);
+      RemoveMovingField(ex,ey);
+    }
 
     for(y=ey-1;y<ey+2;y++) for(x=ex-1;x<ex+2;x++)
     {
       int element = Feld[x][y];
 
-      if (!IN_LEV_FIELD(x,y) || IS_MASSIV(element))
+      if (IS_MOVING(x,y) || IS_BLOCKED(x,y))
+      {
+	element = MovingOrBlocked2Element(x,y);
+	RemoveMovingField(x,y);
+      }
+
+      if (!IN_LEV_FIELD(x,y) || IS_MASSIV(element) || element==EL_BURNING)
 	continue;
 
-      if (center_element==EL_AMOEBA2DIAM && (x!=ex || y!=ey))
+      if ((mode!=EX_NORMAL || center_element==EL_AMOEBA2DIAM) &&
+	  (x!=ex || y!=ey))
 	continue;
 
       if (element==EL_EXPLODING)
 	element = Store2[x][y];
 
-      if (PLAYER(ex,ey) || center_element==EL_KAEFER)
+      if (IS_PLAYER(ex,ey))
+	Store[x][y] = EL_EDELSTEIN_GELB;
+      else if (center_element==EL_MAULWURF)
+	Store[x][y] = EL_EDELSTEIN_ROT;
+      else if (center_element==EL_PINGUIN)
+	Store[x][y] = EL_EDELSTEIN_LILA;
+      else if (center_element==EL_KAEFER)
 	Store[x][y] = ((x==ex && y==ey) ? EL_DIAMANT : EL_EDELSTEIN);
+      else if (center_element==EL_BUTTERFLY)
+	Store[x][y] = EL_EDELSTEIN_BD;
       else if (center_element==EL_MAMPFER)
 	Store[x][y] = level.mampfer_inhalt[MampferNr][x-ex+1][y-ey+1];
       else if (center_element==EL_AMOEBA2DIAM)
@@ -561,16 +680,29 @@ void Explode(int ex, int ey, int phase)
 	Store[x][y] = EL_EDELSTEIN;
       else if (element==EL_ERZ_DIAM)
 	Store[x][y] = EL_DIAMANT;
+      else if (element==EL_ERZ_EDEL_BD)
+	Store[x][y] = EL_EDELSTEIN_BD;
+      else if (element==EL_ERZ_EDEL_GELB)
+	Store[x][y] = EL_EDELSTEIN_GELB;
+      else if (element==EL_ERZ_EDEL_ROT)
+	Store[x][y] = EL_EDELSTEIN_ROT;
+      else if (element==EL_ERZ_EDEL_LILA)
+	Store[x][y] = EL_EDELSTEIN_LILA;
       else if (!IS_PFORTE(Store[x][y]))
 	Store[x][y] = EL_LEERRAUM;
 
-      if (x!=ex || y!=ey || center_element==EL_AMOEBA2DIAM)
+      if (x!=ex || y!=ey || center_element==EL_AMOEBA2DIAM || mode==EX_BORDER)
 	Store2[x][y] = element;
 
-      if (AmoebaNr[x][y] && (element==EL_AMOEBE_VOLL || element==EL_AMOEBING))
+      if (AmoebaNr[x][y] &&
+	  (element==EL_AMOEBE_VOLL ||
+	   element==EL_AMOEBE_BD ||
+	   element==EL_AMOEBING))
+      {
 	AmoebaCnt[AmoebaNr[x][y]]--;
+	AmoebaCnt2[AmoebaNr[x][y]]--;
+      }
 
-      RemoveMovingField(x,y);
       Feld[x][y] = EL_EXPLODING;
       MovDir[x][y] = MovPos[x][y] = 0;
       AmoebaNr[x][y] = 0;
@@ -596,12 +728,9 @@ void Explode(int ex, int ey, int phase)
   {
     int element = Store2[x][y];
 
-    if (PLAYER(x,y))
+    if (IS_PLAYER(x,y))
       KillHero();
-    else if (element==EL_BOMBE ||
-	     element==EL_DYNAMIT ||
-	     element==EL_DYNAMIT_AUS ||
-	     element==EL_KAEFER)
+    else if (IS_EXPLOSIVE(element))
     {
       Feld[x][y] = Store2[x][y];
       Store2[x][y] = 0;
@@ -629,39 +758,79 @@ void Explode(int ex, int ey, int phase)
 
     DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_EXPLOSION+(phase/delay-1));
   }
+}
+
+void DynaExplode(int ex, int ey, int size)
+{
+  int i,j;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+
+  Explode(ex,ey,0,EX_CENTER);
+
+  for(i=0;i<4;i++)
+  {
+    for(j=1;j<=size;j++)
+    {
+      int x = ex+j*xy[i%4][0];
+      int y = ey+j*xy[i%4][1];
+      int element;
+
+      if (!IN_LEV_FIELD(x,y) || IS_MASSIV(Feld[x][y]))
+	break;
+
+      element = Feld[x][y];
+      Explode(x,y,0,EX_BORDER);
+
+      if (element != EL_LEERRAUM &&
+	  element != EL_ERDREICH &&
+	  element != EL_EXPLODING &&
+	  !DynaBombXL)
+	break;
+    }
+  }
 
-  CheckExploding=TRUE;
+  DynaBombsLeft++;
 }
 
 void Bang(int x, int y)
 {
   int element = Feld[x][y];
 
-  CheckExploding=TRUE;
   PlaySoundLevel(x,y,SND_ROAAAR);
 
   switch(element)
   {
     case EL_KAEFER:
-      RaiseScore(level.score[SC_KAEFER]);
-      break;
     case EL_FLIEGER:
-      RaiseScore(level.score[SC_FLIEGER]);
-      break;
+    case EL_BUTTERFLY:
+    case EL_FIREFLY:
     case EL_MAMPFER:
-      RaiseScore(level.score[SC_MAMPFER]);
+    case EL_MAMPFER2:
+    case EL_ROBOT:
+    case EL_PACMAN:
+      RaiseScoreElement(element);
+      Explode(x,y,0,EX_NORMAL);
       break;
-    case EL_ZOMBIE:
-      RaiseScore(level.score[SC_ZOMBIE]);
+    case EL_DYNABOMB:
+    case EL_DYNABOMB_NR:
+    case EL_DYNABOMB_SZ:
+    case EL_DYNABOMB_XL:
+      DynaExplode(x,y,DynaBombSize);
       break;
-    case EL_PACMAN:
-      RaiseScore(level.score[SC_PACMAN]);
+    case EL_BIRNE_AUS:
+    case EL_BIRNE_EIN:
+      Explode(x,y,0,EX_CENTER);
       break;
     default:
+      Explode(x,y,0,EX_NORMAL);
       break;
   }
-
-  Explode(x,y,0);
 }
 
 void Blurb(int x, int y)
@@ -688,8 +857,6 @@ void Blurb(int x, int y)
   {
     int graphic = (element==EL_BLURB_LEFT ? GFX_BLURB_LEFT : GFX_BLURB_RIGHT);
 
-    CheckExploding=TRUE;
-
     if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
       MovDelay[x][y] = 5;
 
@@ -713,15 +880,20 @@ void Impact(int x, int y)
   BOOL lastline = (y==lev_fieldy-1);
   BOOL object_hit = FALSE;
   int element = Feld[x][y];
+  int smashed = 0;
 
   /* Element darunter berührt? */
   if (!lastline)
+  {
     object_hit = (!IS_FREE(x,y+1) && (!IS_MOVING(x,y+1) ||
 				      MovDir[x][y+1]!=MV_DOWN ||
 				      MovPos[x][y+1]<=TILEY/2));
+    if (object_hit)
+      smashed = MovingOrBlocked2Element(x,y+1);
+  }
 
   /* Auftreffendes Element fällt in Salzsäure */
-  if (!lastline && Feld[x][y+1]==EL_SALZSAEURE)
+  if (!lastline && smashed==EL_SALZSAEURE)
   {
     Blurb(x,y);
     return;
@@ -737,8 +909,10 @@ void Impact(int x, int y)
   /* Auftreffendes Element ist Säuretropfen */
   if (element==EL_TROPFEN && (lastline || object_hit))
   {
-    if (object_hit && PLAYER(x,y+1))
+    if (object_hit && IS_PLAYER(x,y+1))
       KillHero();
+    else if (object_hit && (smashed==EL_MAULWURF || smashed==EL_PINGUIN))
+      Bang(x,y+1);
     else
     {
       Feld[x][y] = EL_AMOEBING;
@@ -750,23 +924,39 @@ void Impact(int x, int y)
   /* Welches Element kriegt was auf die Rübe? */
   if (!lastline && object_hit)
   {
-    int smashed = Feld[x][y+1];
+    if (CAN_CHANGE(element) && 
+	(smashed==EL_SIEB_LEER || smashed==EL_SIEB2_LEER) && !SiebAktiv)
+      SiebAktiv = level.dauer_sieb * FRAMES_PER_SECOND;
 
-    if (PLAYER(x,y+1))
+    if (IS_PLAYER(x,y+1))
     {
       KillHero();
       return;
     }
+    else if (smashed==EL_MAULWURF || smashed==EL_PINGUIN)
+    {
+      Bang(x,y+1);
+      return;
+    }
+    else if (element==EL_EDELSTEIN_BD)
+    {
+      if (IS_ENEMY(smashed) && IS_BD_ELEMENT(smashed))
+      {
+	Bang(x,y+1);
+	return;
+      }
+    }
     else if (element==EL_FELSBROCKEN)
     {
-      if (IS_ENEMY(MovingOrBlocked2Element(x,y+1)))
+      if (IS_ENEMY(smashed) || smashed==EL_BOMBE || smashed==EL_SONDE ||
+	  smashed==EL_SCHWEIN || smashed==EL_DRACHE)
       {
 	Bang(x,y+1);
 	return;
       }
       else if (!IS_MOVING(x,y+1))
       {
-	if (smashed==EL_BOMBE)
+	if (smashed==EL_BIRNE_AUS || smashed==EL_BIRNE_EIN)
 	{
 	  Bang(x,y+1);
 	  return;
@@ -775,7 +965,7 @@ void Impact(int x, int y)
 	{
 	  Feld[x][y+1] = EL_CRACKINGNUT;
 	  PlaySoundLevel(x,y,SND_KNACK);
-	  RaiseScore(level.score[SC_KOKOSNUSS]);
+	  RaiseScoreElement(EL_KOKOSNUSS);
 	  return;
 	}
 	else if (smashed==EL_DIAMANT)
@@ -788,9 +978,12 @@ void Impact(int x, int y)
     }
   }
 
-  /* Kein Geräusch beim Durchqueren des Siebes */
-  if (!lastline && Feld[x][y+1]==EL_SIEB_LEER)
+  /* Geräusch beim Durchqueren des Siebes */
+  if (!lastline && (Feld[x][y+1]==EL_SIEB_LEER || Feld[x][y+1]==EL_SIEB2_LEER))
+  {
+    PlaySoundLevel(x,y,SND_QUIRK);
     return;
+  }
 
   /* Geräusch beim Auftreffen */
   if (lastline || object_hit)
@@ -800,6 +993,10 @@ void Impact(int x, int y)
     switch(element)
     {
       case EL_EDELSTEIN:
+      case EL_EDELSTEIN_BD:
+      case EL_EDELSTEIN_GELB:
+      case EL_EDELSTEIN_ROT:
+      case EL_EDELSTEIN_LILA:
       case EL_DIAMANT:
         sound = SND_PLING;
 	break;
@@ -832,162 +1029,354 @@ void Impact(int x, int y)
 
 void TurnRound(int x, int y)
 {
+  static struct
+  {
+    int x,y;
+  } move_xy[] =
+  {
+    { 0,0 },
+    {-1,0 },
+    {+1,0 },
+    { 0,0 },
+    { 0,-1 },
+    { 0,0 }, { 0,0 }, { 0,0 },
+    { 0,+1 }
+  };
+  static struct
+  {
+    int left,right,back;
+  } turn[] =
+  {
+    { 0,	0,		0 },
+    { MV_DOWN,	MV_UP,		MV_RIGHT },
+    { MV_UP,	MV_DOWN,	MV_LEFT },
+    { 0,	0,		0 },
+    { MV_LEFT,	MV_RIGHT,	MV_DOWN },
+    { 0,0,0 },	{ 0,0,0 },	{ 0,0,0 },
+    { MV_RIGHT,	MV_LEFT,	MV_UP }
+  };
+
   int element = Feld[x][y];
-  int direction = MovDir[x][y];
+  int old_move_dir = MovDir[x][y];
+  int left_dir = turn[old_move_dir].left;
+  int right_dir = turn[old_move_dir].right;
+  int back_dir = turn[old_move_dir].back;
+
+  int left_dx = move_xy[left_dir].x, left_dy = move_xy[left_dir].y;
+  int right_dx = move_xy[right_dir].x, right_dy = move_xy[right_dir].y;
+  int move_dx = move_xy[old_move_dir].x, move_dy = move_xy[old_move_dir].y;
+  int back_dx = move_xy[back_dir].x, back_dy = move_xy[back_dir].y;
 
-  if (element==EL_KAEFER)
+  int left_x = x+left_dx, left_y = y+left_dy;
+  int right_x = x+right_dx, right_y = y+right_dy;
+  int move_x = x+move_dx, move_y = y+move_dy;
+
+  if (element==EL_KAEFER || element==EL_BUTTERFLY)
   {
     TestIfBadThingHitsOtherBadThing(x,y);
 
-    if (MovDir[x][y]==MV_LEFT)
-    {
-      if (IN_LEV_FIELD(x,y-1) && IS_FREE(x,y-1))
-	MovDir[x][y]=MV_UP;
-      else if (!IN_LEV_FIELD(x-1,y) || !IS_FREE(x-1,y))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_RIGHT)
-    {
-      if (IN_LEV_FIELD(x,y+1) && IS_FREE(x,y+1))
-	MovDir[x][y]=MV_DOWN;
-      else if (!IN_LEV_FIELD(x+1,y) || !IS_FREE(x+1,y))
-	MovDir[x][y]=MV_UP;
-    }
-    else if (MovDir[x][y]==MV_UP)
-    {
-      if (IN_LEV_FIELD(x+1,y) && IS_FREE(x+1,y))
-	MovDir[x][y]=MV_RIGHT;
-      else if (!IN_LEV_FIELD(x,y-1) || !IS_FREE(x,y-1))
-	MovDir[x][y]=MV_LEFT;
-    }
-    else if (MovDir[x][y]==MV_DOWN)
-    {
-      if (IN_LEV_FIELD(x-1,y) && IS_FREE(x-1,y))
-	MovDir[x][y]=MV_LEFT;
-      else if (!IN_LEV_FIELD(x,y+1) || !IS_FREE(x,y+1))
-	MovDir[x][y]=MV_RIGHT;
-    }
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	IS_FREE_OR_PLAYER(right_x,right_y))
+      MovDir[x][y] = right_dir;
+    else if (!IN_LEV_FIELD(move_x,move_y) ||
+	     !IS_FREE_OR_PLAYER(move_x,move_y))
+      MovDir[x][y] = left_dir;
 
-    if (direction!=MovDir[x][y])
-      MovDelay[x][y]=5;
+    if (element==EL_KAEFER && MovDir[x][y] != old_move_dir)
+      MovDelay[x][y] = 5;
+    else if (element==EL_BUTTERFLY)	/* && MovDir[x][y]==left_dir) */
+      MovDelay[x][y] = 1;
   }
-  else if (element==EL_FLIEGER)
+  else if (element==EL_FLIEGER || element==EL_FIREFLY)
   {
     TestIfBadThingHitsOtherBadThing(x,y);
 
-    if (MovDir[x][y]==MV_LEFT)
-    {
-      if (IN_LEV_FIELD(x,y+1) && IS_FREE(x,y+1))
-	MovDir[x][y]=MV_DOWN;
-      else if (!IN_LEV_FIELD(x-1,y) || !IS_FREE(x-1,y))
-	MovDir[x][y]=MV_UP;
-    }
-    else if (MovDir[x][y]==MV_RIGHT)
-    {
-      if (IN_LEV_FIELD(x,y-1) && IS_FREE(x,y-1))
-	MovDir[x][y]=MV_UP;
-      else if (!IN_LEV_FIELD(x+1,y) || !IS_FREE(x+1,y))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_UP)
-    {
-      if (IN_LEV_FIELD(x-1,y) && IS_FREE(x-1,y))
-	MovDir[x][y]=MV_LEFT;
-      else if (!IN_LEV_FIELD(x,y-1) || !IS_FREE(x,y-1))
-	MovDir[x][y]=MV_RIGHT;
-    }
-    else if (MovDir[x][y]==MV_DOWN)
-    {
-      if (IN_LEV_FIELD(x+1,y) && IS_FREE(x+1,y))
-	MovDir[x][y]=MV_RIGHT;
-      else if (!IN_LEV_FIELD(x,y+1) || !IS_FREE(x,y+1))
-	MovDir[x][y]=MV_LEFT;
-    }
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	IS_FREE_OR_PLAYER(left_x,left_y))
+      MovDir[x][y] = left_dir;
+    else if (!IN_LEV_FIELD(move_x,move_y) ||
+	     !IS_FREE_OR_PLAYER(move_x,move_y))
+      MovDir[x][y] = right_dir;
 
-    if (direction!=MovDir[x][y])
-      MovDelay[x][y]=5;
+    if (element==EL_FLIEGER && MovDir[x][y] != old_move_dir)
+      MovDelay[x][y] = 5;
+    else if (element==EL_FIREFLY)	/* && MovDir[x][y]==right_dir) */
+      MovDelay[x][y] = 1;
   }
   else if (element==EL_MAMPFER)
   {
-    if (MovDir[x][y]==MV_LEFT || MovDir[x][y]==MV_RIGHT)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_LEFT ? MV_RIGHT : MV_LEFT);
-      if (IN_LEV_FIELD(x,y-1) &&
-	  (IS_FREE(x,y-1) || Feld[x][y-1]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_UP;
-      if (IN_LEV_FIELD(x,y+1) &&
-	  (IS_FREE(x,y+1) || Feld[x][y+1]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_UP || MovDir[x][y]==MV_DOWN)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_UP ? MV_DOWN : MV_UP);
-      if (IN_LEV_FIELD(x-1,y) &&
-	  (IS_FREE(x-1,y) || Feld[x-1][y]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_LEFT;
-      if (IN_LEV_FIELD(x+1,y) &&
-	  (IS_FREE(x+1,y) || Feld[x+1][y]==EL_DIAMANT) &&
-	  RND(2))
-	MovDir[x][y]=MV_RIGHT;
-    }
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE;
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE_OR_PLAYER(left_x,left_y) ||
+	 Feld[left_x][left_y] == EL_DIAMANT))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE_OR_PLAYER(right_x,right_y) ||
+	 Feld[right_x][right_y] == EL_DIAMANT))
+      can_turn_right = TRUE;
+
+    if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+    else if (can_turn_left)
+      MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+    else if (can_turn_right)
+      MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+    else
+      MovDir[x][y] = back_dir;
+
+    MovDelay[x][y] = 8+8*RND(3);
+  }
+  else if (element==EL_MAMPFER2)
+  {
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE;
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE_OR_PLAYER(left_x,left_y) ||
+	 IS_MAMPF2(Feld[left_x][left_y])))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE_OR_PLAYER(right_x,right_y) ||
+	 IS_MAMPF2(Feld[right_x][right_y])))
+      can_turn_right = TRUE;
+
+    if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+    else if (can_turn_left)
+      MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+    else if (can_turn_right)
+      MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+    else
+      MovDir[x][y] = back_dir;
 
-    MovDelay[x][y]=8+8*RND(3);
+    MovDelay[x][y] = 8+8*RND(3);
   }
   else if (element==EL_PACMAN)
   {
-    if (MovDir[x][y]==MV_LEFT || MovDir[x][y]==MV_RIGHT)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_LEFT ? MV_RIGHT : MV_LEFT);
-      if (IN_LEV_FIELD(x,y-1) &&
-	  (IS_FREE(x,y-1) || IS_AMOEBOID(Feld[x][y-1])) &&
-	  RND(2))
-	MovDir[x][y]=MV_UP;
-      if (IN_LEV_FIELD(x,y+1) &&
-	  (IS_FREE(x,y+1) || IS_AMOEBOID(Feld[x][y+1])) &&
-	  RND(2))
-	MovDir[x][y]=MV_DOWN;
-    }
-    else if (MovDir[x][y]==MV_UP || MovDir[x][y]==MV_DOWN)
-    {
-      MovDir[x][y]=(MovDir[x][y]==MV_UP ? MV_DOWN : MV_UP);
-      if (IN_LEV_FIELD(x-1,y) &&
-	  (IS_FREE(x-1,y) || IS_AMOEBOID(Feld[x-1][y])) &&
-	  RND(2))
-	MovDir[x][y]=MV_LEFT;
-      if (IN_LEV_FIELD(x+1,y) &&
-	  (IS_FREE(x+1,y) || IS_AMOEBOID(Feld[x+1][y])) &&
-	  RND(2))
-	MovDir[x][y]=MV_RIGHT;
-    }
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE;
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE_OR_PLAYER(left_x,left_y) ||
+	 IS_AMOEBOID(Feld[left_x][left_y])))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE_OR_PLAYER(right_x,right_y) ||
+	 IS_AMOEBOID(Feld[right_x][right_y])))
+      can_turn_right = TRUE;
+
+    if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir);
+    else if (can_turn_left)
+      MovDir[x][y] = (RND(2) ? left_dir : back_dir);
+    else if (can_turn_right)
+      MovDir[x][y] = (RND(2) ? right_dir : back_dir);
+    else
+      MovDir[x][y] = back_dir;
+
+    MovDelay[x][y] = 3+RND(20);
+  }
+  else if (element==EL_SCHWEIN)
+  {
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
+    BOOL should_turn_left = FALSE, should_turn_right = FALSE;
+    BOOL should_move_on = FALSE;
+    int rnd_value = 24;
+    int rnd = RND(rnd_value);
+
+    if (IN_LEV_FIELD(left_x,left_y) &&
+	(IS_FREE(left_x,left_y) || IS_GEM(Feld[left_x][left_y])))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) &&
+	(IS_FREE(right_x,right_y) || IS_GEM(Feld[right_x][right_y])))
+      can_turn_right = TRUE;
+    if (IN_LEV_FIELD(move_x,move_y) &&
+	(IS_FREE(move_x,move_y) || IS_GEM(Feld[move_x][move_y])))
+      can_move_on = TRUE;
+
+    if (can_turn_left &&
+	(!can_move_on ||
+	 (IN_LEV_FIELD(x+back_dx+left_dx,y+back_dy+left_dy) &&
+	  !IS_FREE(x+back_dx+left_dx,y+back_dy+left_dy))))
+      should_turn_left = TRUE;
+    if (can_turn_right &&
+	(!can_move_on ||
+	 (IN_LEV_FIELD(x+back_dx+right_dx,y+back_dy+right_dy) &&
+	  !IS_FREE(x+back_dx+right_dx,y+back_dy+right_dy))))
+      should_turn_right = TRUE;
+    if (can_move_on &&
+	(!can_turn_left || !can_turn_right ||
+	 (IN_LEV_FIELD(x+move_dx+left_dx,y+move_dy+left_dy) &&
+	  !IS_FREE(x+move_dx+left_dx,y+move_dy+left_dy)) ||
+	 (IN_LEV_FIELD(x+move_dx+right_dx,y+move_dy+right_dy) &&
+	  !IS_FREE(x+move_dx+right_dx,y+move_dy+right_dy))))
+      should_move_on = TRUE;
+
+    if (should_turn_left || should_turn_right || should_move_on)
+    {
+      if (should_turn_left && should_turn_right && should_move_on)
+	MovDir[x][y] = (rnd < rnd_value/3 ? left_dir :
+			rnd < 2*rnd_value/3 ? right_dir :
+			old_move_dir);
+      else if (should_turn_left && should_turn_right)
+	MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir);
+      else if (should_turn_left && should_move_on)
+	MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : old_move_dir);
+      else if (should_turn_right && should_move_on)
+	MovDir[x][y] = (rnd < rnd_value/2 ? right_dir : old_move_dir);
+      else if (should_turn_left)
+	MovDir[x][y] = left_dir;
+      else if (should_turn_right)
+	MovDir[x][y] = right_dir;
+      else if (should_move_on)
+	MovDir[x][y] = old_move_dir;
+    }
+    else if (can_move_on && rnd > rnd_value/8)
+      MovDir[x][y] = old_move_dir;
+    else if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir);
+    else if (can_turn_left && rnd > rnd_value/8)
+      MovDir[x][y] = left_dir;
+    else if (can_turn_right && rnd > rnd_value/8)
+      MovDir[x][y] = right_dir;
+    else
+      MovDir[x][y] = back_dir;
+
+    if (!IS_FREE(x+move_xy[MovDir[x][y]].x,y+move_xy[MovDir[x][y]].y) &&
+	!IS_GEM(Feld[x+move_xy[MovDir[x][y]].x][y+move_xy[MovDir[x][y]].y]))
+      MovDir[x][y] = old_move_dir;
+
+    MovDelay[x][y] = 0;
+  }
+  else if (element==EL_DRACHE)
+  {
+    BOOL can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
+    int rnd_value = 24;
+    int rnd = RND(rnd_value);
+
+    if (IN_LEV_FIELD(left_x,left_y) && IS_FREE(left_x,left_y))
+      can_turn_left = TRUE;
+    if (IN_LEV_FIELD(right_x,right_y) && IS_FREE(right_x,right_y))
+      can_turn_right = TRUE;
+    if (IN_LEV_FIELD(move_x,move_y) && IS_FREE(move_x,move_y))
+      can_move_on = TRUE;
+
+    if (can_move_on && rnd > rnd_value/8)
+      MovDir[x][y] = old_move_dir;
+    else if (can_turn_left && can_turn_right)
+      MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir);
+    else if (can_turn_left && rnd > rnd_value/8)
+      MovDir[x][y] = left_dir;
+    else if (can_turn_right && rnd > rnd_value/8)
+      MovDir[x][y] = right_dir;
+    else
+      MovDir[x][y] = back_dir;
+
+    if (!IS_FREE(x+move_xy[MovDir[x][y]].x,y+move_xy[MovDir[x][y]].y))
+      MovDir[x][y] = old_move_dir;
 
-    MovDelay[x][y]=3+RND(20);
+    MovDelay[x][y] = 0;
   }
-  else if (element==EL_ZOMBIE)
+  else if (element==EL_ROBOT || element==EL_SONDE ||
+	   element==EL_MAULWURF || element==EL_PINGUIN)
   {
     int attr_x = JX, attr_y = JY;
+    int newx, newy;
 
-    if (ZX>=0 && ZY>=0)
+    if (PlayerGone)
+    {
+      attr_x = ExitX;
+      attr_y = ExitY;
+    }
+
+    if (element==EL_ROBOT && ZX>=0 && ZY>=0)
     {
       attr_x = ZX;
       attr_y = ZY;
     }
 
-    MovDir[x][y]=MV_NO_MOVING;
+    if (element==EL_MAULWURF || element==EL_PINGUIN)
+    {
+      int i;
+      static int xy[4][2] =
+      {
+	{ 0,-1 },
+	{ -1,0 },
+	{ +1,0 },
+	{ 0,+1 }
+      };
+
+      for(i=0;i<4;i++)
+      {
+    	int ex = x+xy[i%4][0];
+    	int ey = y+xy[i%4][1];
+
+    	if (IN_LEV_FIELD(ex,ey) && Feld[ex][ey] == EL_AUSGANG_AUF)
+	{
+	  attr_x = ex;
+ 	  attr_y = ey;
+	  break;
+	}
+      }
+    }
+
+    MovDir[x][y] = MV_NO_MOVING;
     if (attr_x<x)
-      MovDir[x][y]|=MV_LEFT;
+      MovDir[x][y] |= (GameOver ? MV_RIGHT : MV_LEFT);
     else if (attr_x>x)
-      MovDir[x][y]|=MV_RIGHT;
+      MovDir[x][y] |= (GameOver ? MV_LEFT : MV_RIGHT);
     if (attr_y<y)
-      MovDir[x][y]|=MV_UP;
+      MovDir[x][y] |= (GameOver ? MV_DOWN : MV_UP);
     else if (attr_y>y)
-      MovDir[x][y]|=MV_DOWN;
-    if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
-      MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+      MovDir[x][y] |= (GameOver ? MV_UP : MV_DOWN);
+
+    if (element==EL_ROBOT)
+    {
+      if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
+	MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+      Moving2Blocked(x,y,&newx,&newy);
+
+      if (IN_LEV_FIELD(newx,newy) && IS_FREE_OR_PLAYER(newx,newy))
+	MovDelay[x][y] = 4+4*!RND(3);
+      else
+	MovDelay[x][y] = 8;
+    }
+    else
+    {
+      MovDelay[x][y] = 1;
+
+      if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN)))
+      {
+	BOOL first_horiz = RND(2);
+	int new_move_dir = MovDir[x][y];
+
+	MovDir[x][y] =
+	  new_move_dir & (first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+	Moving2Blocked(x,y,&newx,&newy);
+
+	if (IN_LEV_FIELD(newx,newy) &&
+	    (IS_FREE(newx,newy) ||
+	     Feld[newx][newy] == EL_SALZSAEURE ||
+	     ((element == EL_MAULWURF || element==EL_PINGUIN) &&
+	      (Feld[newx][newy] == EL_AUSGANG_AUF ||
+	       IS_MAMPF3(Feld[newx][newy])))))
+	  return;
 
-    MovDelay[x][y] = 8+8*RND(2);
+	MovDir[x][y] =
+	  new_move_dir & (!first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN));
+	Moving2Blocked(x,y,&newx,&newy);
+
+	if (IN_LEV_FIELD(newx,newy) &&
+	    (IS_FREE(newx,newy) ||
+	     Feld[newx][newy] == EL_SALZSAEURE ||
+	     ((element == EL_MAULWURF || element==EL_PINGUIN) &&
+	      (Feld[newx][newy] == EL_AUSGANG_AUF ||
+	       IS_MAMPF3(Feld[newx][newy])))))
+	  return;
+
+	MovDir[x][y] = old_move_dir;
+	return;
+      }
+    }
   }
 }
 
@@ -1010,8 +1399,6 @@ void StartMoving(int x, int y)
       }
       else if (Feld[x][y+1]==EL_MORAST_LEER)
       {
-	CheckMoving=TRUE;
-
 	if (!MovDelay[x][y])
 	  MovDelay[x][y] = 16;
 
@@ -1039,13 +1426,57 @@ void StartMoving(int x, int y)
 	Feld[x][y] = EL_CHANGED(Store2[x][y]);
 	Store[x][y] = EL_SIEB_LEER;
       }
+      else if (Feld[x][y+1]==EL_SIEB_LEER)
+      {
+	if (!MovDelay[x][y])
+	  MovDelay[x][y] = 2;
+
+	if (MovDelay[x][y])
+	{
+	  MovDelay[x][y]--;
+	  if (MovDelay[x][y])
+	    return;
+	}
+
+	Feld[x][y] = EL_SIEB_LEER;
+	Feld[x][y+1] = EL_SIEB_VOLL;
+	Store2[x][y+1] = EL_CHANGED(Store2[x][y]);
+	Store2[x][y] = 0;
+      }
+    }
+    else if (element==EL_SIEB2_VOLL)
+    {
+      if (IS_FREE(x,y+1))
+      {
+	InitMovingField(x,y,MV_DOWN);
+	Feld[x][y] = EL_CHANGED2(Store2[x][y]);
+	Store[x][y] = EL_SIEB2_LEER;
+      }
+      else if (Feld[x][y+1]==EL_SIEB2_LEER)
+      {
+	if (!MovDelay[x][y])
+	  MovDelay[x][y] = 2;
+
+	if (MovDelay[x][y])
+	{
+	  MovDelay[x][y]--;
+	  if (MovDelay[x][y])
+	    return;
+	}
+
+	Feld[x][y] = EL_SIEB2_LEER;
+	Feld[x][y+1] = EL_SIEB2_VOLL;
+	Store2[x][y+1] = EL_CHANGED2(Store2[x][y]);
+	Store2[x][y] = 0;
+      }
     }
-    else if (CAN_CHANGE(element) && Feld[x][y+1]==EL_SIEB_LEER)
+    else if (SiebAktiv && CAN_CHANGE(element) &&
+	     (Feld[x][y+1]==EL_SIEB_LEER || Feld[x][y+1]==EL_SIEB2_LEER))
     {
       InitMovingField(x,y,MV_DOWN);
-      Store[x][y] = EL_SIEB_VOLL;
+      Store[x][y] =
+	(Feld[x][y+1]==EL_SIEB_LEER ? EL_SIEB_VOLL : EL_SIEB2_VOLL);
       Store2[x][y+1] = element;
-      SiebAktiv = 330;
     }
     else if (CAN_SMASH(element) && Feld[x][y+1]==EL_SALZSAEURE)
     {
@@ -1053,7 +1484,7 @@ void StartMoving(int x, int y)
       InitMovingField(x,y,MV_DOWN);
       Store[x][y] = EL_SALZSAEURE;
     }
-    else if (CAN_SMASH(element) && Feld[x][y+1]==EL_BLOCKED)
+    else if (CAN_SMASH(element) && Feld[x][y+1]==EL_BLOCKED && JustHit[x][y])
     {
       Impact(x,y);
     }
@@ -1068,15 +1499,16 @@ void StartMoving(int x, int y)
     }
     else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1])
     {
-      int left  = (x>0 && IS_FREE(x-1,y) &&
-		   (IS_FREE(x-1,y+1) || Feld[x-1][y+1]==EL_SALZSAEURE));
-      int right = (x<lev_fieldx-1 && IS_FREE(x+1,y) &&
-		   (IS_FREE(x+1,y+1) || Feld[x+1][y+1]==EL_SALZSAEURE));
+      BOOL left  = (x>0 && IS_FREE(x-1,y) &&
+		    (IS_FREE(x-1,y+1) || Feld[x-1][y+1]==EL_SALZSAEURE));
+      BOOL right = (x<lev_fieldx-1 && IS_FREE(x+1,y) &&
+		    (IS_FREE(x+1,y+1) || Feld[x+1][y+1]==EL_SALZSAEURE));
 
       if (left || right)
       {
-	if (left && right)
-	  left = !(right=RND(2));
+	if (left && right && game_emulation != EMU_BOULDERDASH)
+	  left = !(right = RND(2));
+
 	InitMovingField(x,y,left ? MV_LEFT : MV_RIGHT);
       }
     }
@@ -1085,14 +1517,16 @@ void StartMoving(int x, int y)
   {
     int newx,newy;
 
-    CheckMoving = TRUE;
-
     if (!MovDelay[x][y])	/* neuer Schritt / noch nicht gewartet */
     {
-      if (element==EL_ZOMBIE || element==EL_KAEFER || element==EL_FLIEGER)
+      /* Alle Figuren, die nach jeden Schritt die Richtung wechseln können.
+       * (MAMPFER, MAMPFER2 und PACMAN laufen bis zur nächsten Wand.)
+       */
+
+      if (element!=EL_MAMPFER && element!=EL_MAMPFER2 && element!=EL_PACMAN)
       {
 	TurnRound(x,y);
-	if (MovDelay[x][y] && (element==EL_KAEFER || element==EL_FLIEGER))
+	if (MovDelay[x][y] && (element == EL_KAEFER || element == EL_FLIEGER))
 	  DrawLevelField(x,y);
       }
     }
@@ -1101,7 +1535,7 @@ void StartMoving(int x, int y)
     {
       MovDelay[x][y]--;
 
-      if (element==EL_ZOMBIE || element==EL_MAMPFER)
+      if (element==EL_ROBOT || element==EL_MAMPFER || element==EL_MAMPFER2)
       {
 	int phase = MovDelay[x][y] % 8;
 
@@ -1109,22 +1543,64 @@ void StartMoving(int x, int y)
 	  phase = 7-phase;
 
 	if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-	  DrawGraphic(SCROLLX(x),SCROLLY(y),
-		      el2gfx(element)+phase);
+	  DrawGraphic(SCROLLX(x),SCROLLY(y), el2gfx(element)+phase);
 
-	if (element==EL_MAMPFER && MovDelay[x][y]%4==3)
+	if ((element==EL_MAMPFER || element==EL_MAMPFER2)
+	    && MovDelay[x][y]%4==3)
 	  PlaySoundLevel(x,y,SND_NJAM);
       }
+      else if (element==EL_DRACHE)
+      {
+	int i;
+	int dir = MovDir[x][y];
+	int dx = (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
+	int dy = (dir == MV_UP   ? -1 : dir == MV_DOWN  ? +1 : 0);
+	int graphic = (dir == MV_LEFT	? GFX_FLAMMEN_LEFT :
+		       dir == MV_RIGHT	? GFX_FLAMMEN_RIGHT :
+		       dir == MV_UP	? GFX_FLAMMEN_UP :
+		       dir == MV_DOWN	? GFX_FLAMMEN_DOWN : GFX_LEERRAUM);
+	int phase = FrameCounter % 2;
+
+	for(i=1;i<=3;i++)
+	{
+	  int xx = x + i*dx, yy = y + i*dy;
+	  int sx = SCROLLX(xx), sy = SCROLLY(yy);
+
+	  if (!IN_LEV_FIELD(xx,yy) ||
+	      IS_SOLID(Feld[xx][yy]) || Feld[xx][yy]==EL_EXPLODING)
+	    break;
+
+	  if (MovDelay[x][y])
+	  {
+	    int flamed = MovingOrBlocked2Element(xx,yy);
+
+	    if (IS_ENEMY(flamed) || IS_EXPLOSIVE(flamed))
+	      Bang(xx,yy);
+	    else
+	      RemoveMovingField(xx,yy);
+
+	    Feld[xx][yy] = EL_BURNING;
+	    if (IN_SCR_FIELD(sx,sy))
+	      DrawGraphic(sx,sy, graphic + phase*3 + i-1);
+	  }
+	  else
+	  {
+	    if (Feld[xx][yy] == EL_BURNING)
+	      Feld[xx][yy] = EL_LEERRAUM;
+	    DrawLevelField(xx,yy);
+	  }
+	}
+      }
 
       if (MovDelay[x][y])
 	return;
     }
 
-    if (element==EL_KAEFER)
+    if (element==EL_KAEFER || element==EL_BUTTERFLY)
     {
       PlaySoundLevel(x,y,SND_KLAPPER);
     }
-    else if (element==EL_FLIEGER)
+    else if (element==EL_FLIEGER || element==EL_FIREFLY)
     {
       PlaySoundLevel(x,y,SND_ROEHR);
     }
@@ -1133,63 +1609,193 @@ void StartMoving(int x, int y)
 
     Moving2Blocked(x,y,&newx,&newy);	/* wohin soll's gehen? */
 
-    if (PLAYER(newx,newy))		/* Spieler erwischt */
+    if (IS_ENEMY(element) && IS_PLAYER(newx,newy))
     {
+      /* Spieler erwischt */
       MovDir[x][y] = 0;
       KillHero();
       return;
     }
-    else if (element==EL_MAMPFER && IN_LEV_FIELD(newx,newy) &&
-	     Feld[newx][newy]==EL_DIAMANT)
-    {
-      if (IS_MOVING(newx,newy))
-	RemoveMovingField(newx,newy);
-      else
-      {
-	Feld[newx][newy] = EL_LEERRAUM;
-	DrawLevelField(newx,newy);
-      }
-    }
-    else if (element==EL_PACMAN && IN_LEV_FIELD(newx,newy) &&
-	     IS_AMOEBOID(Feld[newx][newy]))
-    {
-      if (AmoebaNr[newx][newy] && Feld[newx][newy]==EL_AMOEBE_VOLL)
-	AmoebaCnt[AmoebaNr[newx][newy]]--;
-
-      Feld[newx][newy] = EL_LEERRAUM;
-      DrawLevelField(newx,newy);
-    }
-    else if (element==EL_ZOMBIE && IN_LEV_FIELD(newx,newy) &&
+    else if ((element == EL_MAULWURF || element == EL_PINGUIN ||
+	      element==EL_ROBOT || element==EL_SONDE) &&
+	     IN_LEV_FIELD(newx,newy) &&
 	     MovDir[x][y]==MV_DOWN && Feld[newx][newy]==EL_SALZSAEURE)
     {
       Blurb(x,y);
       Store[x][y] = EL_SALZSAEURE;
     }
-    else if (!IN_LEV_FIELD(newx,newy) || !IS_FREE(newx,newy))
-    {					/* gegen Wand gelaufen */
-      TurnRound(x,y);
-      DrawLevelField(x,y);
-      return;
-    }
-
-    InitMovingField(x,y,MovDir[x][y]);
-  }
+    else if ((element == EL_MAULWURF || element == EL_PINGUIN) &&
+	     IN_LEV_FIELD(newx,newy))
+    {
+      if (Feld[newx][newy] == EL_AUSGANG_AUF)
+      {
+	Feld[x][y] = EL_LEERRAUM;
+	DrawLevelField(x,y);
 
-  if (MovDir[x][y])
-    ContinueMoving(x,y);
-}
+	PlaySoundLevel(newx,newy,SND_BUING);
+	if (IN_SCR_FIELD(SCROLLX(newx),SCROLLY(newy)))
+	  DrawGraphicThruMask(SCROLLX(newx),SCROLLY(newy),el2gfx(element));
 
-void ContinueMoving(int x, int y)
-{
-  int element = Feld[x][y];
-  int direction = MovDir[x][y];
-  int dx = (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0);
-  int dy = (direction==MV_UP   ? -1 : direction==MV_DOWN  ? +1 : 0);
-  int horiz_move = (dx!=0);
-  int newx = x + dx, newy = y + dy;
-  int step = (horiz_move ? dx : dy)*TILEX/4;
+	Friends--;
+	if (!Friends && PlayerGone && !GameOver)
+	  LevelSolved = GameOver = TRUE;
 
-  if (CAN_FALL(element) && horiz_move)
+	return;
+      }
+      else if (IS_MAMPF3(Feld[newx][newy]))
+      {
+	if (DigField(newx,newy, 0,0, DF_DIG) == MF_MOVING)
+	  DrawLevelField(newx,newy);
+	else
+	  MovDir[x][y] = MV_NO_MOVING;
+      }
+      else if (!IS_FREE(newx,newy))
+      {
+	if (IS_PLAYER(x,y))
+	  DrawPlayerField();
+	else
+	  DrawLevelField(x,y);
+	return;
+      }
+    }
+    else if (element == EL_SCHWEIN && IN_LEV_FIELD(newx,newy))
+    {
+      if (IS_GEM(Feld[newx][newy]))
+      {
+	if (IS_MOVING(newx,newy))
+	  RemoveMovingField(newx,newy);
+	else
+	{
+	  Feld[newx][newy] = EL_LEERRAUM;
+	  DrawLevelField(newx,newy);
+	}
+      }
+      else if (!IS_FREE(newx,newy))
+      {
+	if (IS_PLAYER(x,y))
+	  DrawPlayerField();
+	else
+	  DrawLevelField(x,y);
+	return;
+      }
+    }
+    else if (element==EL_DRACHE && IN_LEV_FIELD(newx,newy))
+    {
+      if (!IS_FREE(newx,newy))
+      {
+	if (IS_PLAYER(x,y))
+	  DrawPlayerField();
+	else
+	  DrawLevelField(x,y);
+	return;
+      }
+      else
+      {
+	BOOL wanna_flame = !RND(10);
+	int dx = newx - x, dy = newy - y;
+	int newx1 = newx+1*dx, newy1 = newy+1*dy;
+	int newx2 = newx+2*dx, newy2 = newy+2*dy;
+	int element1 = (IN_LEV_FIELD(newx1,newy1) ?
+			MovingOrBlocked2Element(newx1,newy1) : EL_BETON);
+	int element2 = (IN_LEV_FIELD(newx2,newy2) ?
+			MovingOrBlocked2Element(newx2,newy2) : EL_BETON);
+
+	if ((wanna_flame || IS_ENEMY(element1) || IS_ENEMY(element2)) &&
+	    element1 != EL_DRACHE && element2 != EL_DRACHE &&
+	    element1 != EL_BURNING && element2 != EL_BURNING)
+	{
+	  if (IS_PLAYER(x,y))
+	    DrawPlayerField();
+	  else
+	    DrawLevelField(x,y);
+
+	  MovDelay[x][y] = 25;
+	  Feld[newx][newy] = EL_BURNING;
+	  if (IN_LEV_FIELD(newx1,newy1) && Feld[newx1][newy1] == EL_LEERRAUM)
+	    Feld[newx1][newy1] = EL_BURNING;
+	  if (IN_LEV_FIELD(newx2,newy2) && Feld[newx2][newy2] == EL_LEERRAUM)
+	    Feld[newx2][newy2] = EL_BURNING;
+	  return;
+	}
+      }
+    }
+    else if (element==EL_MAMPFER && IN_LEV_FIELD(newx,newy) &&
+	     Feld[newx][newy]==EL_DIAMANT)
+    {
+      if (IS_MOVING(newx,newy))
+	RemoveMovingField(newx,newy);
+      else
+      {
+	Feld[newx][newy] = EL_LEERRAUM;
+	DrawLevelField(newx,newy);
+      }
+    }
+    else if (element==EL_MAMPFER2 && IN_LEV_FIELD(newx,newy) &&
+	     IS_MAMPF2(Feld[newx][newy]))
+    {
+      if (AmoebaNr[newx][newy])
+      {
+	AmoebaCnt2[AmoebaNr[newx][newy]]--;
+	if (Feld[newx][newy]==EL_AMOEBE_VOLL || Feld[newx][newy]==EL_AMOEBE_BD)
+	  AmoebaCnt[AmoebaNr[newx][newy]]--;
+      }
+
+      if (IS_MOVING(newx,newy))
+	RemoveMovingField(newx,newy);
+      else
+      {
+	Feld[newx][newy] = EL_LEERRAUM;
+	DrawLevelField(newx,newy);
+      }
+    }
+    else if (element==EL_PACMAN && IN_LEV_FIELD(newx,newy) &&
+	     IS_AMOEBOID(Feld[newx][newy]))
+    {
+      if (AmoebaNr[newx][newy])
+      {
+	AmoebaCnt2[AmoebaNr[newx][newy]]--;
+	if (Feld[newx][newy]==EL_AMOEBE_VOLL || Feld[newx][newy]==EL_AMOEBE_BD)
+	  AmoebaCnt[AmoebaNr[newx][newy]]--;
+      }
+
+      Feld[newx][newy] = EL_LEERRAUM;
+      DrawLevelField(newx,newy);
+    }
+    else if (!IN_LEV_FIELD(newx,newy) || !IS_FREE(newx,newy))
+    {					/* gegen Wand gelaufen */
+      TurnRound(x,y);
+
+      if (element == EL_KAEFER || element == EL_FLIEGER)
+	DrawLevelField(x,y);
+      else if (element == EL_BUTTERFLY || element == EL_FIREFLY)
+	DrawGraphicAnimation(x,y, el2gfx(element), 2, 2, ANIM_NORMAL);
+      else if (element==EL_SONDE)
+	DrawGraphicAnimation(x,y, GFX_SONDE_START, 8, 1, ANIM_NORMAL);
+
+      return;
+    }
+
+    if (element==EL_ROBOT && IN_SCR_FIELD(x,y))
+      PlaySoundLevel(x,y,SND_SCHLURF);
+
+    InitMovingField(x,y,MovDir[x][y]);
+  }
+
+  if (MovDir[x][y])
+    ContinueMoving(x,y);
+}
+
+void ContinueMoving(int x, int y)
+{
+  int element = Feld[x][y];
+  int direction = MovDir[x][y];
+  int dx = (direction==MV_LEFT ? -1 : direction==MV_RIGHT ? +1 : 0);
+  int dy = (direction==MV_UP   ? -1 : direction==MV_DOWN  ? +1 : 0);
+  int horiz_move = (dx!=0);
+  int newx = x + dx, newy = y + dy;
+  int step = (horiz_move ? dx : dy)*TILEX/4;
+
+  if (CAN_FALL(element) && horiz_move)
     step*=2;
   else if (element==EL_TROPFEN)
     step/=2;
@@ -1200,8 +1806,8 @@ void ContinueMoving(int x, int y)
 
   if (ABS(MovPos[x][y])>=TILEX)		/* Zielfeld erreicht */
   {
-    Feld[x][y]=EL_LEERRAUM;
-    Feld[newx][newy]=element;
+    Feld[x][y] = EL_LEERRAUM;
+    Feld[newx][newy] = element;
 
     if (Store[x][y]==EL_MORAST_VOLL)
     {
@@ -1217,13 +1823,22 @@ void ContinueMoving(int x, int y)
     else if (Store[x][y]==EL_SIEB_VOLL)
     {
       Store[x][y] = 0;
-      Feld[newx][newy] = EL_SIEB_VOLL;
-      element = EL_SIEB_VOLL;
+      element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB_VOLL : EL_SIEB_TOT);
     }
     else if (Store[x][y]==EL_SIEB_LEER)
     {
       Store[x][y] = Store2[x][y] = 0;
-      Feld[x][y] = EL_SIEB_LEER;
+      Feld[x][y] = (SiebAktiv ? EL_SIEB_LEER : EL_SIEB_TOT);
+    }
+    else if (Store[x][y]==EL_SIEB2_VOLL)
+    {
+      Store[x][y] = 0;
+      element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB2_VOLL : EL_SIEB2_TOT);
+    }
+    else if (Store[x][y]==EL_SIEB2_LEER)
+    {
+      Store[x][y] = Store2[x][y] = 0;
+      Feld[x][y] = (SiebAktiv ? EL_SIEB2_LEER : EL_SIEB2_TOT);
     }
     else if (Store[x][y]==EL_SALZSAEURE)
     {
@@ -1237,7 +1852,8 @@ void ContinueMoving(int x, int y)
       Feld[x][y] = EL_AMOEBE_NASS;
     }
 
-    MovPos[x][y] = MovDir[x][y] = 0;
+    MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
+    MovDelay[newx][newy] = 0;
 
     if (!CAN_MOVE(element))
       MovDir[newx][newy] = 0;
@@ -1245,24 +1861,24 @@ void ContinueMoving(int x, int y)
     DrawLevelField(x,y);
     DrawLevelField(newx,newy);
 
-    Stop[newx][newy]=TRUE;
-    CheckMoving=TRUE;
+    Stop[newx][newy] = TRUE;
+    JustHit[x][newy] = 3;
 
     if (DONT_TOUCH(element))	/* Käfer oder Flieger */
     {
       TestIfBadThingHitsHero();
+      TestIfBadThingHitsFriend(newx,newy);
       TestIfBadThingHitsOtherBadThing(newx,newy);
     }
+    else if (element == EL_PINGUIN)
+      TestIfFriendHitsBadThing(newx,newy);
 
     if (CAN_SMASH(element) && direction==MV_DOWN &&
 	(newy==lev_fieldy-1 || !IS_FREE(x,newy+1)))
       Impact(x,newy);
   }
   else				/* noch in Bewegung */
-  {
     DrawLevelField(x,y);
-    CheckMoving=TRUE;
-  }
 }
 
 int AmoebeNachbarNr(int ax, int ay)
@@ -1272,10 +1888,10 @@ int AmoebeNachbarNr(int ax, int ay)
   int group_nr = 0;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
   for(i=0;i<4;i++)
@@ -1299,10 +1915,10 @@ void AmoebenVereinigen(int ax, int ay)
   int new_group_nr = AmoebaNr[ax][ay];
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
   if (!new_group_nr)
@@ -1316,13 +1932,17 @@ void AmoebenVereinigen(int ax, int ay)
     if (!IN_LEV_FIELD(x,y))
       continue;
 
-    if ((Feld[x][y]==EL_AMOEBE_VOLL || Feld[x][y]==EL_AMOEBE_TOT) &&
+    if ((Feld[x][y]==EL_AMOEBE_VOLL ||
+	 Feld[x][y]==EL_AMOEBE_BD ||
+	 Feld[x][y]==EL_AMOEBE_TOT) &&
 	AmoebaNr[x][y] != new_group_nr)
     {
       int old_group_nr = AmoebaNr[x][y];
 
       AmoebaCnt[new_group_nr] += AmoebaCnt[old_group_nr];
       AmoebaCnt[old_group_nr] = 0;
+      AmoebaCnt2[new_group_nr] += AmoebaCnt2[old_group_nr];
+      AmoebaCnt2[old_group_nr] = 0;
 
       for(yy=0;yy<lev_fieldy;yy++) for(xx=0;xx<lev_fieldx;xx++)
 	if (AmoebaNr[xx][yy]==old_group_nr)
@@ -1337,10 +1957,10 @@ void AmoebeUmwandeln(int ax, int ay)
   int group_nr = AmoebaNr[ax][ay];
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
   if (Feld[ax][ay]==EL_AMOEBE_TOT)
@@ -1371,13 +1991,35 @@ void AmoebeUmwandeln(int ax, int ay)
   }
 }
 
+void AmoebeUmwandeln2(int ax, int ay, int new_element)
+{
+  int x,y;
+  int group_nr = AmoebaNr[ax][ay];
+  BOOL done = FALSE;
+
+  for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+  {
+    if (AmoebaNr[x][y]==group_nr &&
+	(Feld[x][y]==EL_AMOEBE_TOT ||
+	 Feld[x][y]==EL_AMOEBE_BD ||
+	 Feld[x][y]==EL_AMOEBING))
+    {
+      AmoebaNr[x][y] = 0;
+      Feld[x][y] = new_element;
+      DrawLevelField(x,y);
+      done = TRUE;
+    }
+  }
+
+  if (done)
+    PlaySoundLevel(ax,ay,new_element==EL_FELSBROCKEN ? SND_KLOPF : SND_PLING);
+}
+
 void AmoebeWaechst(int x, int y)
 {
   static long sound_delay = 0;
   static int sound_delay_value = 0;
 
-  CheckExploding=TRUE;
-
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
   {
     MovDelay[x][y] = 4;
@@ -1411,14 +2053,12 @@ void AmoebeAbleger(int ax, int ay)
   int newax = ax, neway = ay;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
-  CheckExploding=TRUE;
-
   if (!level.tempo_amoebe)
   {
     Feld[ax][ay] = EL_AMOEBE_TOT;
@@ -1427,7 +2067,7 @@ void AmoebeAbleger(int ax, int ay)
   }
 
   if (!MovDelay[ax][ay])	/* neue Amoebe / noch nicht gewartet */
-    MovDelay[ax][ay] = RND(33*20/(1+level.tempo_amoebe));
+    MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25/(1+level.tempo_amoebe));
 
   if (MovDelay[ax][ay])		/* neue Amoebe / in Wartezustand */
   {
@@ -1476,7 +2116,7 @@ void AmoebeAbleger(int ax, int ay)
 	neway = y;
 	break;
       }
-      else if (PLAYER(x,y))
+      else if (IS_PLAYER(x,y))
 	waiting_for_player = TRUE;
     }
 
@@ -1486,19 +2126,32 @@ void AmoebeAbleger(int ax, int ay)
       {
 	Feld[ax][ay] = EL_AMOEBE_TOT;
 	DrawLevelField(ax,ay);
+	AmoebaCnt[AmoebaNr[ax][ay]]--;
 
-	if (element==EL_AMOEBE_VOLL && --AmoebaCnt[AmoebaNr[ax][ay]]<=0)
-	  AmoebeUmwandeln(ax,ay);
+	if (AmoebaCnt[AmoebaNr[ax][ay]]<=0)	/* Amöbe vollständig tot */
+	{
+	  if (element==EL_AMOEBE_VOLL)
+	    AmoebeUmwandeln(ax,ay);
+	  else if (element==EL_AMOEBE_BD)
+	    AmoebeUmwandeln2(ax,ay,level.amoebe_inhalt);
+	}
       }
       return;
     }
-    else if (element==EL_AMOEBE_VOLL)
+    else if (element==EL_AMOEBE_VOLL || element==EL_AMOEBE_BD)
     {
       int new_group_nr = AmoebaNr[ax][ay];
 
       AmoebaNr[newax][neway] = new_group_nr;
       AmoebaCnt[new_group_nr]++;
+      AmoebaCnt2[new_group_nr]++;
       AmoebenVereinigen(newax,neway);
+
+      if (AmoebaCnt2[new_group_nr] >= 200 && element==EL_AMOEBE_BD)
+      {
+	AmoebeUmwandeln2(newax,neway,EL_FELSBROCKEN);
+	return;
+      }
     }
   }
 
@@ -1529,8 +2182,6 @@ void Life(int ax, int ay)
   int life_time = 20;
   int element = Feld[ax][ay];
 
-  CheckExploding=TRUE;
-
   if (Stop[ax][ay])
     return;
 
@@ -1559,7 +2210,7 @@ void Life(int ax, int ay)
       if (!IN_LEV_FIELD(x,y) || (x==xx && y==yy))
 	continue;
 
-      if (((Feld[x][y]==element || (element==EL_LIFE && PLAYER(x,y))) &&
+      if (((Feld[x][y]==element || (element==EL_LIFE && IS_PLAYER(x,y))) &&
 	   !Stop[x][y]) ||
 	  (IS_FREE(x,y) && Stop[x][y]))
 	nachbarn++;
@@ -1591,10 +2242,9 @@ void Life(int ax, int ay)
 
 void Ablenk(int x, int y)
 {
-  CheckExploding=TRUE;
-
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 33*(level.dauer_ablenk/10);
+    MovDelay[x][y] = level.dauer_ablenk * FRAMES_PER_SECOND;
+
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
     MovDelay[x][y]--;
@@ -1608,16 +2258,14 @@ void Ablenk(int x, int y)
     }
   }
 
-  Feld[x][y]=EL_ABLENK_AUS;
+  Feld[x][y] = EL_ABLENK_AUS;
   DrawLevelField(x,y);
   if (ZX==x && ZY==y)
-    ZX=ZY=-1;
+    ZX = ZY = -1;
 }
 
 void Birne(int x, int y)
 {
-  CheckExploding=TRUE;
-
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
     MovDelay[x][y] = 400;
 
@@ -1647,26 +2295,11 @@ void Birne(int x, int y)
 
 void Blubber(int x, int y)
 {
-  CheckExploding=TRUE;
-
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 20;
-
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
-  {
-    int blubber;
-
-    MovDelay[x][y]--;
-    blubber = MovDelay[x][y]/5;
-    if (!(MovDelay[x][y]%5) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_GEBLUBBER+3-blubber);
-  }
+  DrawGraphicAnimation(x,y, GFX_GEBLUBBER, 4, 5, ANIM_NORMAL);
 }
 
 void NussKnacken(int x, int y)
 {
-  CheckExploding=TRUE;
-
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
     MovDelay[x][y] = 4;
 
@@ -1684,51 +2317,37 @@ void NussKnacken(int x, int y)
   }
 }
 
-void SiebAktivieren(int x, int y)
+void SiebAktivieren(int x, int y, int typ)
 {
-  CheckExploding=TRUE;
-
-  if (SiebAktiv>1)
-  {
-    if (SiebAktiv%2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_SIEB_VOLL+3-(SiebAktiv%8)/2);
-
-/*
-    if (!(SiebAktiv%4))
-      PlaySoundLevel(x,y,SND_MIEP);
-*/
-
-  }
-  else
-  {
-    Feld[x][y] = EL_SIEB_TOT;
-    DrawLevelField(x,y);
-  }
+  if (SiebAktiv%2 && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+    DrawGraphic(SCROLLX(x),SCROLLY(y),
+		(typ==1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL)+3-(SiebAktiv%8)/2);
 }
 
 void AusgangstuerPruefen(int x, int y)
 {
-  CheckExploding=TRUE;
-
-  if (!Gems)
+  if (!Gems && !SokobanFields && !Lights)
+  {
     Feld[x][y] = EL_AUSGANG_ACT;
+    PlaySoundLevel(x,y,SND_OEFFNEN);
+  }
 }
 
 void AusgangstuerOeffnen(int x, int y)
 {
-  CheckExploding=TRUE;
+  int speed = 3;
 
   if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
-    MovDelay[x][y] = 20;
+    MovDelay[x][y] = 5*speed;
 
   if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
   {
     int tuer;
 
     MovDelay[x][y]--;
-    tuer = MovDelay[x][y]/5;
-    if (!(MovDelay[x][y]%5) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AUSGANG_ZU+3-tuer);
+    tuer = MovDelay[x][y]/speed;
+    if (!(MovDelay[x][y]%speed) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+      DrawGraphic(SCROLLX(x),SCROLLY(y),GFX_AUSGANG_AUF-tuer);
 
     if (!MovDelay[x][y])
     {
@@ -1738,130 +2357,416 @@ void AusgangstuerOeffnen(int x, int y)
   }
 }
 
-int GameActions(int mx, int my, int button)
+void AusgangstuerBlinken(int x, int y)
 {
-  static long time_delay=0, action_delay=0;
-  int Action;
-
-  if (TimeLeft>0 && DelayReached(&time_delay,100) && !tape.pausing)
-  {
-    TimeLeft--;
+  DrawGraphicAnimation(x,y, GFX_AUSGANG_AUF, 4, 2, ANIM_OSCILLATE);
+}
 
-    if (tape.recording || tape.playing)
-      DrawVideoDisplay(VIDEO_STATE_TIME_ON,level.time-TimeLeft);
+void EdelsteinFunkeln(int x, int y)
+{
+  if (!IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)) || IS_MOVING(x,y))
+    return;
 
-    if (TimeLeft<=10)
-      PlaySoundStereo(SND_GONG,PSND_MAX_RIGHT);
+  if (Feld[x][y] == EL_EDELSTEIN_BD)
+  {
+    const int delay = 2;
+    const int frames = 4;
+    int phase = (FrameCounter % (delay*frames)) / delay;
 
-    DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
-    BackToFront();
+    if (!(FrameCounter % delay))
+      DrawGraphic(SCROLLX(x),SCROLLY(y), GFX_EDELSTEIN_BD - phase);
   }
+  else
+  {
+    if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
+      MovDelay[x][y] = 6*!SimpleRND(500);
 
-  if (!TimeLeft)
-    KillHero();
+    if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+    {
+      MovDelay[x][y]--;
 
-  Action = (CheckMoving || CheckExploding || SiebAktiv);
+      if (direct_draw_on && MovDelay[x][y])
+	drawto_field = backbuffer;
 
-/*
-  if (Action && DelayReached(&action_delay,3))
-*/
+      DrawGraphic(SCROLLX(x),SCROLLY(y), el2gfx(Feld[x][y]));
 
-  if (DelayReached(&action_delay,3))
-  {
-    int x,y,element;
+      if (MovDelay[x][y])
+      {
+	int src_x,src_y, dest_x,dest_y;
+	int phase = MovDelay[x][y]-1;
 
-    if (tape.pausing || (tape.playing && !TapePlayDelay()))
-      return(ACT_GO_ON);
-    else if (tape.recording)
-      TapeRecordDelay();
+	src_x  = SX+GFX_PER_LINE*TILEX;
+	src_y  = SY+(phase > 2 ? 4-phase : phase)*TILEY;
+	dest_x = SX+SCROLLX(x)*TILEX;
+	dest_y = SY+SCROLLY(y)*TILEY;
 
-    CheckMoving = CheckExploding = FALSE;
-    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
-      Stop[x][y] = FALSE;
+	XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
+	XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
+		  src_x,src_y, TILEX,TILEY, dest_x,dest_y);
 
-    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
-    {
-      element = Feld[x][y];
+	if (direct_draw_on)
+	{
+	  XCopyArea(display,backbuffer,window,gc,
+		    dest_x,dest_y, TILEX,TILEY, dest_x,dest_y);
+	  drawto_field = window;
+	}
+      }
+    }
+  }
+}
 
-      if (element==EL_LEERRAUM || element==EL_ERDREICH)
-	continue;
+void MauerWaechst(int x, int y)
+{
+  int speed = 3;
 
-      if (!IS_MOVING(x,y) && (CAN_FALL(element) || CAN_MOVE(element)))
-	StartMoving(x,y);
-      else if (IS_MOVING(x,y))
-	ContinueMoving(x,y);
-      else if (element==EL_DYNAMIT)
-	CheckDynamite(x,y);
-      else if (element==EL_EXPLODING)
-	Explode(x,y,Frame[x][y]);
-      else if (element==EL_AMOEBING)
-	AmoebeWaechst(x,y);
-      else if (IS_AMOEBALIVE(element))
-	AmoebeAbleger(x,y);
-      else if (element==EL_LIFE || element==EL_LIFE_ASYNC)
-	Life(x,y);
-      else if (element==EL_ABLENK_EIN)
-	Ablenk(x,y);
-      else if (element==EL_SALZSAEURE)
-	Blubber(x,y);
-      else if (element==EL_BLURB_LEFT || element==EL_BLURB_RIGHT)
-	Blurb(x,y);
-      else if (element==EL_CRACKINGNUT)
-	NussKnacken(x,y);
-      else if (element==EL_AUSGANG_ZU)
-	AusgangstuerPruefen(x,y);
-      else if (element==EL_AUSGANG_ACT)
-	AusgangstuerOeffnen(x,y);
+  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+    MovDelay[x][y] = 3*speed;
 
-      if (SiebAktiv && (element==EL_SIEB_LEER ||
-			element==EL_SIEB_VOLL ||
-			Store[x][y]==EL_SIEB_LEER))
-	SiebAktivieren(x,y);
-    }
+  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  {
+    int phase;
 
-    if (SiebAktiv)
-      SiebAktiv--;
+    MovDelay[x][y]--;
+    phase = 2-MovDelay[x][y]/speed;
+    if (!(MovDelay[x][y]%speed) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+      DrawGraphic(SCROLLX(x),SCROLLY(y),
+		  (Store[x][y]==MV_LEFT ? GFX_MAUER_L1 : GFX_MAUER_R1)+phase);
 
-    if (CheckMoving || CheckExploding)
-      BackToFront();
-  }
+    if (!MovDelay[x][y])
+    {
+      if (Store[x][y]==MV_LEFT)
+      {
+	if (IN_LEV_FIELD(x-1,y) && IS_MAUER(Feld[x-1][y]))
+	  DrawLevelField(x-1,y);
+      }
+      else
+      {
+	if (IN_LEV_FIELD(x+1,y) && IS_MAUER(Feld[x+1][y]))
+	  DrawLevelField(x+1,y);
+      }
 
-  return(ACT_GO_ON);
+      Feld[x][y] = EL_MAUER_LEBT;
+      Store[x][y] = 0;
+      DrawLevelField(x,y);
+    }
+  }
 }
 
-void ScrollLevel(int dx, int dy)
+void MauerAbleger(int ax, int ay)
 {
-  int x,y;
+  BOOL links_frei = FALSE, rechts_frei = FALSE;
+  BOOL links_massiv = FALSE, rechts_massiv = FALSE;
 
-  XCopyArea(display,drawto_field,drawto_field,gc,
-	    SX+TILEX*(dx==-1),SY+TILEY*(dy==-1),
-	    SXSIZE-TILEX*(dx!=0),SYSIZE-TILEY*(dy!=0),
-	    SX+TILEX*(dx==1),SY+TILEY*(dy==1));
+  if (!MovDelay[ax][ay])	/* neue Mauer / noch nicht gewartet */
+    MovDelay[ax][ay] = 3;
 
-  if (dx)
+  if (MovDelay[ax][ay])		/* neue Mauer / in Wartezustand */
   {
-    x = dx==1 ? 0 : SCR_FIELDX-1;
-    for(y=0;y<SCR_FIELDY;y++)
-      DrawScreenField(x,y);
+    MovDelay[ax][ay]--;
+    if (MovDelay[ax][ay])
+      return;
   }
-  if (dy)
+
+  if (IN_LEV_FIELD(ax-1,ay) && IS_FREE(ax-1,ay))
+    links_frei = TRUE;
+  if (IN_LEV_FIELD(ax+1,ay) && IS_FREE(ax+1,ay))
+    rechts_frei = TRUE;
+
+  if (links_frei)
   {
-    y = dy==1 ? 0 : SCR_FIELDY-1;
-    for(x=0;x<SCR_FIELDY;x++)
-      DrawScreenField(x,y);
+    Feld[ax-1][ay] = EL_MAUERND;
+    Store[ax-1][ay] = MV_LEFT;
+    if (IN_SCR_FIELD(SCROLLX(ax-1),SCROLLY(ay)))
+      DrawGraphic(SCROLLX(ax-1),SCROLLY(ay),GFX_MAUER_L1);
+  }
+  if (rechts_frei)
+  {
+    Feld[ax+1][ay] = EL_MAUERND;
+    Store[ax+1][ay] = MV_RIGHT;
+    if (IN_SCR_FIELD(SCROLLX(ax+1),SCROLLY(ay)))
+      DrawGraphic(SCROLLX(ax+1),SCROLLY(ay),GFX_MAUER_R1);
+  }
+
+  if (links_frei || rechts_frei)
+    DrawLevelField(ax,ay);
+
+  if (!IN_LEV_FIELD(ax-1,ay) || IS_MAUER(Feld[ax-1][ay]))
+    links_massiv = TRUE;
+  if (!IN_LEV_FIELD(ax+1,ay) || IS_MAUER(Feld[ax+1][ay]))
+    rechts_massiv = TRUE;
+
+  if (links_massiv && rechts_massiv)
+    Feld[ax][ay] = EL_MAUERWERK;
+}
+
+void CheckForDragon(int x, int y)
+{
+  int i,j;
+  BOOL dragon_found = FALSE;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+
+  for(i=0;i<4;i++)
+  {
+    for(j=0;j<4;j++)
+    {
+      int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
+
+      if (IN_LEV_FIELD(xx,yy) &&
+	  (Feld[xx][yy] == EL_BURNING || Feld[xx][yy] == EL_DRACHE))
+      {
+	if (Feld[xx][yy] == EL_DRACHE)
+	  dragon_found = TRUE;
+      }
+      else
+	break;
+    }
+  }
+
+  if (!dragon_found)
+  {
+    for(i=0;i<4;i++)
+    {
+      for(j=0;j<3;j++)
+      {
+  	int xx = x + j*xy[i][0], yy = y + j*xy[i][1];
+  
+  	if (IN_LEV_FIELD(xx,yy) && Feld[xx][yy] == EL_BURNING)
+  	{
+	  Feld[xx][yy] = EL_LEERRAUM;
+	  DrawLevelField(xx,yy);
+  	}
+  	else
+  	  break;
+      }
+    }
+  }
+}
+
+void GameActions()
+{
+  static long action_delay=0;
+  long action_delay_value;
+
+  if (game_status != PLAYING)
+    return;
+
+/*
+  action_delay_value =
+    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : GAME_FRAME_DELAY);
+*/
+
+  action_delay_value =
+    (tape.playing && tape.fast_forward ? FFWD_FRAME_DELAY : Gamespeed);
+
+  if (DelayReached(&action_delay, action_delay_value))
+  {
+    int x,y,element;
+    int sieb_x = 0, sieb_y = 0;
+
+    if (tape.pausing || (tape.playing && !TapePlayDelay()))
+      return;
+    else if (tape.recording)
+      TapeRecordDelay();
+
+    FrameCounter++;
+    TimeFrames++;
+
+    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+    {
+      Stop[x][y] = FALSE;
+      if (JustHit[x][y]>0)
+	JustHit[x][y]--;
+
+#if DEBUG
+      if (IS_BLOCKED(x,y))
+      {
+	int oldx,oldy;
+
+	Blocked2Moving(x,y,&oldx,&oldy);
+	if (!IS_MOVING(oldx,oldy))
+	{
+	  printf("GameActions(): (BLOCKED=>MOVING) context corrupted!\n");
+	  printf("GameActions(): BLOCKED: x = %d, y = %d\n",x,y);
+	  printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n",oldx,oldy);
+	  printf("GameActions(): This should never happen!\n");
+	}
+      }
+#endif
+
+    }
+
+    for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+    {
+      element = Feld[x][y];
+
+      if (IS_INACTIVE(element))
+	continue;
+
+      if (!IS_MOVING(x,y) && (CAN_FALL(element) || CAN_MOVE(element)))
+      {
+	StartMoving(x,y);
+
+	if (IS_GEM(element))
+	  EdelsteinFunkeln(x,y);
+      }
+      else if (IS_MOVING(x,y))
+	ContinueMoving(x,y);
+      else if (element==EL_DYNAMIT || element==EL_DYNABOMB)
+	CheckDynamite(x,y);
+      else if (element==EL_EXPLODING)
+	Explode(x,y,Frame[x][y],EX_NORMAL);
+      else if (element==EL_AMOEBING)
+	AmoebeWaechst(x,y);
+      else if (IS_AMOEBALIVE(element))
+	AmoebeAbleger(x,y);
+      else if (element==EL_LIFE || element==EL_LIFE_ASYNC)
+	Life(x,y);
+      else if (element==EL_ABLENK_EIN)
+	Ablenk(x,y);
+      else if (element==EL_SALZSAEURE)
+	Blubber(x,y);
+      else if (element==EL_BLURB_LEFT || element==EL_BLURB_RIGHT)
+	Blurb(x,y);
+      else if (element==EL_CRACKINGNUT)
+	NussKnacken(x,y);
+      else if (element==EL_AUSGANG_ZU)
+	AusgangstuerPruefen(x,y);
+      else if (element==EL_AUSGANG_ACT)
+	AusgangstuerOeffnen(x,y);
+      else if (element==EL_AUSGANG_AUF)
+	AusgangstuerBlinken(x,y);
+      else if (element==EL_MAUERND)
+	MauerWaechst(x,y);
+      else if (element==EL_MAUER_LEBT)
+	MauerAbleger(x,y);
+      else if (element==EL_BURNING)
+	CheckForDragon(x,y);
+
+      if (SiebAktiv)
+      {
+	BOOL sieb = FALSE;
+
+	if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL ||
+	    Store[x][y]==EL_SIEB_LEER)
+	{
+	  SiebAktivieren(x, y, 1);
+	  sieb = TRUE;
+	}
+	else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL ||
+		 Store[x][y]==EL_SIEB2_LEER)
+	{
+	  SiebAktivieren(x, y, 2);
+	  sieb = TRUE;
+	}
+
+	if (sieb && ABS(x-JX)+ABS(y-JY) < ABS(sieb_x-JX)+ABS(sieb_y-JY))
+	{
+	  sieb_x = x;
+	  sieb_y = y;
+	}
+      }
+    }
+
+    if (SiebAktiv)
+    {
+      if (!(SiebAktiv%4))
+	PlaySoundLevel(sieb_x,sieb_y,SND_MIEP);
+      SiebAktiv--;
+      if (!SiebAktiv)
+      {
+	for(y=0;y<lev_fieldy;y++) for(x=0;x<lev_fieldx;x++)
+	{
+	  element = Feld[x][y];
+	  if (element==EL_SIEB_LEER || element==EL_SIEB_VOLL)
+	  {
+	    Feld[x][y] = EL_SIEB_TOT;
+	    DrawLevelField(x,y);
+	  }
+	  else if (element==EL_SIEB2_LEER || element==EL_SIEB2_VOLL)
+	  {
+	    Feld[x][y] = EL_SIEB2_TOT;
+	    DrawLevelField(x,y);
+	  }
+	}
+      }
+    }
+  }
+
+  if (TimeLeft>0 && TimeFrames>=25 && !tape.pausing)
+  {
+    TimeFrames = 0;
+    TimeLeft--;
+
+    if (tape.recording || tape.playing)
+      DrawVideoDisplay(VIDEO_STATE_TIME_ON,level.time-TimeLeft);
+
+    if (TimeLeft<=10)
+      PlaySoundStereo(SND_GONG,PSND_MAX_RIGHT);
+
+    DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
+
+    if (!TimeLeft)
+      KillHero();
+  }
+
+  BackToFront();
+}
+
+void ScrollLevel(int dx, int dy)
+{
+  int x,y;
+
+  XCopyArea(display,drawto_field,drawto_field,gc,
+	    SX+TILEX*(dx==-1),SY+TILEY*(dy==-1),
+	    SXSIZE-TILEX*(dx!=0),SYSIZE-TILEY*(dy!=0),
+	    SX+TILEX*(dx==1),SY+TILEY*(dy==1));
+
+  if (dx)
+  {
+    x = (dx==1 ? 0 : SCR_FIELDX-1);
+    for(y=0;y<SCR_FIELDY;y++)
+      DrawScreenField(x,y);
+  }
+  if (dy)
+  {
+    y = (dy==1 ? 0 : SCR_FIELDY-1);
+    for(x=0;x<SCR_FIELDX;x++)
+      DrawScreenField(x,y);
   }
 
   redraw_mask|=REDRAW_FIELD;
 }
 
-BOOL MoveFigureOneStep(int dx, int dy)
+BOOL MoveFigureOneStep(int dx, int dy, int real_dx, int real_dy)
 {
   int oldJX,oldJY, newJX = JX+dx,newJY = JY+dy;
   int element;
   int can_move;
 
-  if (!dx && !dy)
+/*
+  int old_move_dir = PlayerMovDir;
+*/
+
+  if (PlayerGone || (!dx && !dy))
     return(MF_NO_ACTION);
+
+  PlayerMovDir = (dx < 0 ? MV_LEFT :
+		  dx > 0 ? MV_RIGHT :
+		  dy < 0 ? MV_UP :
+		  dy > 0 ? MV_DOWN :	MV_NO_MOVING);
+/*
+  if (old_move_dir != PlayerMovDir)
+    PlayerFrame = 0;
+  else
+    PlayerFrame = (PlayerFrame + 1) % 4;
+*/
+
   if (!IN_LEV_FIELD(newJX,newJY))
     return(MF_NO_ACTION);
 
@@ -1876,11 +2781,7 @@ BOOL MoveFigureOneStep(int dx, int dy)
       InitMovingField(JX,JY,MV_DOWN);
       Store[JX][JY] = EL_SALZSAEURE;
       ContinueMoving(JX,JY);
-
-      PlaySoundLevel(JX,JY,SND_AUTSCH);
-      PlaySoundLevel(JX,JY,SND_LACHEN);
-      GameOver = TRUE;
-      JX = JY = -1;
+      BuryHero();
     }
     else
       KillHero();
@@ -1888,7 +2789,7 @@ BOOL MoveFigureOneStep(int dx, int dy)
     return(MF_MOVING);
   }
 
-  can_move = DigField(newJX,newJY,DF_DIG);
+  can_move = DigField(newJX,newJY, real_dx,real_dy, DF_DIG);
   if (can_move != MF_MOVING)
     return(can_move);
 
@@ -1897,6 +2798,15 @@ BOOL MoveFigureOneStep(int dx, int dy)
   JX = newJX;
   JY = newJY;
 
+
+  JX2 = oldJX;
+  JY2 = oldJY;
+
+  PlayerMovPos = TILEX/4;
+  PlayerMovPos = (dx > 0 || dy > 0 ? -1 : 1) * 3*TILEX/4;
+
+  ScrollFigure(-1);
+
   if (Store[oldJX][oldJY])
   {
     DrawGraphic(SCROLLX(oldJX),SCROLLY(oldJY),el2gfx(Store[oldJX][oldJY]));
@@ -1915,58 +2825,113 @@ BOOL MoveFigure(int dx, int dy)
 {
   static long move_delay = 0;
   int moved = MF_NO_ACTION;
+  int oldJX = JX, oldJY = JY;
 
-  if (GameOver || (!dx && !dy))
+  if (PlayerGone || (!dx && !dy))
     return(FALSE);
 
+/*
+  if (!DelayReached(&move_delay,8) && !tape.playing)
+    return(FALSE);
+*/
+
+/*
   if (!DelayReached(&move_delay,10) && !tape.playing)
     return(FALSE);
+*/
 
-  if (moved |= MoveFigureOneStep(dx,0))
-    moved |= MoveFigureOneStep(0,dy);
+/*
+  if (!FrameReached(&move_delay,2) && !tape.playing)
+    return(FALSE);
+*/
+
+  if (Movemethod == 0)
+  {
+    if (!DelayReached(&move_delay,Movespeed[0]) && !tape.playing)
+      return(FALSE);
+  }
+  else
+  {
+    if (!FrameReached(&move_delay,Movespeed[1]) && !tape.playing)
+      return(FALSE);
+  }
+
+  if (moved |= MoveFigureOneStep(dx,0, dx,dy))
+    moved |= MoveFigureOneStep(0,dy, dx,dy);
   else
   {
-    moved |= MoveFigureOneStep(0,dy);
-    moved |= MoveFigureOneStep(dx,0);
+    moved |= MoveFigureOneStep(0,dy, dx,dy);
+    moved |= MoveFigureOneStep(dx,0, dx,dy);
   }
 
   if (moved & MF_MOVING)
   {
     int old_scroll_x=scroll_x, old_scroll_y=scroll_y;
+    int offset = (scroll_delay_on ? 3 : 0);
 
-    if (scroll_x!=JX-MIDPOSX && JX>=MIDPOSX-1 && JX<=lev_fieldx-MIDPOSX)
-      scroll_x = JX-MIDPOSX;
-    if (scroll_y!=JY-MIDPOSY && JY>=MIDPOSY-1 && JY<=lev_fieldy-MIDPOSY)
-      scroll_y = JY-MIDPOSY;
+    if ((scroll_x < JX-MIDPOSX-offset || scroll_x > JX-MIDPOSX+offset) &&
+	JX>=MIDPOSX-1-offset && JX<=lev_fieldx-(MIDPOSX-offset))
+      scroll_x = JX-MIDPOSX + (scroll_x < JX-MIDPOSX ? -offset : offset);
+    if ((scroll_y < JY-MIDPOSY-offset || scroll_y > JY-MIDPOSY+offset) &&
+	JY>=MIDPOSY-1-offset && JY<=lev_fieldy-(MIDPOSY-offset))
+      scroll_y = JY-MIDPOSY + (scroll_y < JY-MIDPOSY ? -offset : offset);
 
     if (scroll_x!=old_scroll_x || scroll_y!=old_scroll_y)
       ScrollLevel(old_scroll_x-scroll_x,old_scroll_y-scroll_y);
+  }
 
-    if (Feld[JX][JY]==EL_LEERRAUM)
-      DrawLevelElement(JX,JY,EL_SPIELFIGUR);
-    else
-      DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_SPIELFIGUR);
+  if (!(moved & MF_MOVING) && !PlayerPushing)
+    PlayerFrame = 0;
+  else
+    PlayerFrame = (PlayerFrame + 1) % 4;
+
+  if (moved & MF_MOVING)
+  {
+    if (oldJX != JX && oldJY == JY)
+      PlayerMovDir = (oldJX < JX ? MV_RIGHT : MV_LEFT);
+    else if (oldJX == JX && oldJY != JY)
+      PlayerMovDir = (oldJY < JY ? MV_DOWN : MV_UP);
+
+    DrawLevelField(JX,JY);	/* für "ErdreichAnbroeckeln()" */
   }
 
   TestIfHeroHitsBadThing();
 
   BackToFront();
 
-  if (LevelSolved)
-    GameWon();
+  if (PlayerGone)
+    RemoveHero();
 
   return(moved);
 }
 
-void TestIfHeroHitsBadThing()
+void ScrollFigure(int init)
+{
+  static long actual_frame_counter;
+
+  if (init)
+  {
+    actual_frame_counter = FrameCounter;
+    return;
+  }
+  else if (!FrameReached(&actual_frame_counter,1))
+    return;
+
+  PlayerMovPos += (PlayerMovPos > 0 ? -1 : 1) * TILEX/4;
+
+  DrawLevelElement(JX2,JY2, Feld[JX2][JY2]);
+  DrawPlayerField();
+}
+
+void TestIfGoodThingHitsBadThing(int goodx, int goody)
 {
-  int i, killx = JX,killy = JY;
+  int i, killx = goodx, killy = goody;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
   static int harmless[4] =
   {
@@ -1980,8 +2945,8 @@ void TestIfHeroHitsBadThing()
   {
     int x,y,element;
 
-    x = JX+xy[i][0];
-    y = JY+xy[i][1];
+    x = goodx+xy[i][0];
+    y = goody+xy[i][1];
     if (!IN_LEV_FIELD(x,y))
       continue;
 
@@ -1998,13 +2963,78 @@ void TestIfHeroHitsBadThing()
     }
   }
 
-  if (killx!=JX || killy!=JY)
-    KillHero();
+  if (killx!=goodx || killy!=goody)
+  {
+    if (IS_PLAYER(goodx,goody))
+      KillHero();
+    else
+      Bang(goodx,goody);
+  }
+}
+
+void TestIfBadThingHitsGoodThing(int badx, int bady)
+{
+  int i, killx = badx, killy = bady;
+  static int xy[4][2] =
+  {
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
+  };
+  static int harmless[4] =
+  {
+    MV_UP,
+    MV_LEFT,
+    MV_RIGHT,
+    MV_DOWN
+  };
+
+  for(i=0;i<4;i++)
+  {
+    int x,y,element;
+
+    x = badx+xy[i][0];
+    y = bady+xy[i][1];
+    if (!IN_LEV_FIELD(x,y))
+      continue;
+
+    element = Feld[x][y];
+
+    if (element==EL_PINGUIN)
+    {
+      if (MovDir[x][y]==harmless[i] && IS_MOVING(x,y))
+	continue;
+
+      killx = x;
+      killy = y;
+      break;
+    }
+  }
+
+  if (killx!=badx || killy!=bady)
+    Bang(killx,killy);
+}
+
+void TestIfHeroHitsBadThing()
+{
+  TestIfGoodThingHitsBadThing(JX,JY);
 }
 
 void TestIfBadThingHitsHero()
 {
-  TestIfHeroHitsBadThing();
+  TestIfGoodThingHitsBadThing(JX,JY);
+  /* (no typo!) */
+}
+
+void TestIfFriendHitsBadThing(int x, int y)
+{
+  TestIfGoodThingHitsBadThing(x,y);
+}
+
+void TestIfBadThingHitsFriend(int x, int y)
+{
+  TestIfBadThingHitsGoodThing(x,y);
 }
 
 void TestIfBadThingHitsOtherBadThing(int badx, int bady)
@@ -2012,10 +3042,10 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady)
   int i, killx=badx, killy=bady;
   static int xy[4][2] =
   {
-    0,-1,
-    -1,0,
-    +1,0,
-    0,+1
+    { 0,-1 },
+    { -1,0 },
+    { +1,0 },
+    { 0,+1 }
   };
 
   for(i=0;i<4;i++)
@@ -2043,27 +3073,47 @@ void TestIfBadThingHitsOtherBadThing(int badx, int bady)
 
 void KillHero()
 {
-  if (PLAYER(-1,-1))
+  if (PlayerGone)
     return;
 
   if (IS_PFORTE(Feld[JX][JY]))
     Feld[JX][JY] = EL_LEERRAUM;
 
+  Bang(JX,JY);
+  BuryHero();
+}
+
+void BuryHero()
+{
+  if (PlayerGone)
+    return;
+
   PlaySoundLevel(JX,JY,SND_AUTSCH);
   PlaySoundLevel(JX,JY,SND_LACHEN);
-  Bang(JX,JY);
+
   GameOver = TRUE;
+  RemoveHero();
+}
+
+void RemoveHero()
+{
+  PlayerGone = TRUE;
+
+  ExitX = ZX = JX;
+  ExitY = ZY = JY;
   JX = JY = -1;
 }
 
-int DigField(int x, int y, int mode)
+int DigField(int x, int y, int real_dx, int real_dy, int mode)
 {
-  int dx=x-JX, dy=y-JY;
+  int dx = x-JX, dy = y-JY;
   int element;
   static long push_delay = 0;
-  static int push_delay_value = 20;
+  static int push_delay_value = 5;
+
+  PlayerPushing = FALSE;
 
-  if (mode==DF_NO_PUSH)
+  if (mode == DF_NO_PUSH)
   {
     push_delay = 0;
     return(MF_NO_ACTION);
@@ -2077,39 +3127,66 @@ int DigField(int x, int y, int mode)
   switch(element)
   {
     case EL_LEERRAUM:
-      CheckMoving=TRUE;
       break;
+
     case EL_ERDREICH:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
+      Feld[x][y] = EL_LEERRAUM;
       break;
+
     case EL_EDELSTEIN:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
+    case EL_EDELSTEIN_BD:
+    case EL_EDELSTEIN_GELB:
+    case EL_EDELSTEIN_ROT:
+    case EL_EDELSTEIN_LILA:
+      Feld[x][y] = EL_LEERRAUM;
+      MovDelay[x][y] = 0;	/* wegen EDELSTEIN_BD-Funkeln! */
       if (Gems>0)
 	Gems--;
-      RaiseScore(level.score[SC_EDELSTEIN]);
+      RaiseScoreElement(EL_EDELSTEIN);
       DrawText(DX_EMERALDS,DY_EMERALDS,int2str(Gems,3),FS_SMALL,FC_YELLOW);
       PlaySoundLevel(x,y,SND_PONG);
       break;
+
     case EL_DIAMANT:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
+      Feld[x][y] = EL_LEERRAUM;
       Gems -= 3;
       if (Gems<0)
 	Gems=0;
-      RaiseScore(level.score[SC_DIAMANT]);
+      RaiseScoreElement(EL_DIAMANT);
       DrawText(DX_EMERALDS,DY_EMERALDS,int2str(Gems,3),FS_SMALL,FC_YELLOW);
       PlaySoundLevel(x,y,SND_PONG);
       break;
+
     case EL_DYNAMIT_AUS:
-      Feld[x][y]=EL_LEERRAUM;
-      CheckMoving=TRUE;
+      Feld[x][y] = EL_LEERRAUM;
       Dynamite++;
-      RaiseScore(level.score[SC_DYNAMIT]);
+      RaiseScoreElement(EL_DYNAMIT);
       DrawText(DX_DYNAMITE,DY_DYNAMITE,int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
       PlaySoundLevel(x,y,SND_PONG);
       break;
+
+    case EL_DYNABOMB_NR:
+      Feld[x][y] = EL_LEERRAUM;
+      DynaBombCount++;
+      DynaBombsLeft++;
+      RaiseScoreElement(EL_DYNAMIT);
+      PlaySoundLevel(x,y,SND_PONG);
+      break;
+    case EL_DYNABOMB_SZ:
+
+      Feld[x][y] = EL_LEERRAUM;
+      DynaBombSize++;
+      RaiseScoreElement(EL_DYNAMIT);
+      PlaySoundLevel(x,y,SND_PONG);
+      break;
+
+    case EL_DYNABOMB_XL:
+      Feld[x][y] = EL_LEERRAUM;
+      DynaBombXL = TRUE;
+      RaiseScoreElement(EL_DYNAMIT);
+      PlaySoundLevel(x,y,SND_PONG);
+      break;
+
     case EL_SCHLUESSEL1:
     case EL_SCHLUESSEL2:
     case EL_SCHLUESSEL3:
@@ -2118,9 +3195,8 @@ int DigField(int x, int y, int mode)
       int key_nr = element-EL_SCHLUESSEL1;
 
       Feld[x][y] = EL_LEERRAUM;
-      CheckMoving = TRUE;
       Key[key_nr] = TRUE;
-      RaiseScore(level.score[SC_SCHLUESSEL]);
+      RaiseScoreElement(EL_SCHLUESSEL);
       DrawMiniGraphicExtHiRes(drawto,gc,
 			      DX_KEYS+key_nr*MINI_TILEX,DY_KEYS,
 			      GFX_SCHLUESSEL1+key_nr);
@@ -2130,32 +3206,43 @@ int DigField(int x, int y, int mode)
       PlaySoundLevel(x,y,SND_PONG);
       break;
     }
+
     case EL_ABLENK_AUS:
       Feld[x][y] = EL_ABLENK_EIN;
-      CheckExploding=TRUE;
-      ZX=x;
-      ZY=y;
+      ZX = x;
+      ZY = y;
       DrawLevelField(x,y);
       return(MF_ACTION);
       break;
+
     case EL_FELSBROCKEN:
     case EL_BOMBE:
     case EL_KOKOSNUSS:
     case EL_ZEIT_LEER:
-      if (mode==DF_SNAP)
+      if (dy || mode==DF_SNAP)
 	return(MF_NO_ACTION);
-      if (dy || !IN_LEV_FIELD(x+dx,y+dy) || Feld[x+dx][y+dy]!=EL_LEERRAUM)
+
+      PlayerPushing = TRUE;
+
+      if (!IN_LEV_FIELD(x+dx,y+dy) || Feld[x+dx][y+dy] != EL_LEERRAUM)
 	return(MF_NO_ACTION);
 
-      if (Counter() > push_delay+4*push_delay_value)
-	push_delay = Counter();
-      if (!DelayReached(&push_delay,push_delay_value) && !tape.playing)
+      if (real_dy)
+      {
+	if (IN_LEV_FIELD(JX,JY+real_dy) && !IS_SOLID(Feld[JX][JY+real_dy]))
+	  return(MF_NO_ACTION);
+      }
+
+      if (push_delay == 0)
+	push_delay = FrameCounter;
+      if (!FrameReached(&push_delay,push_delay_value) && !tape.playing)
 	return(MF_NO_ACTION);
 
       Feld[x][y] = EL_LEERRAUM;
       Feld[x+dx][y+dy] = element;
-      push_delay_value = 10+RND(30);
-      CheckMoving = TRUE;
+
+      push_delay_value = 2+RND(8);
+
       DrawLevelField(x+dx,y+dy);
       if (element==EL_FELSBROCKEN)
 	PlaySoundLevel(x+dx,y+dy,SND_PUSCH);
@@ -2164,6 +3251,7 @@ int DigField(int x, int y, int mode)
       else
 	PlaySoundLevel(x+dx,y+dy,SND_KLOPF);
       break;
+
     case EL_PFORTE1:
     case EL_PFORTE2:
     case EL_PFORTE3:
@@ -2171,6 +3259,7 @@ int DigField(int x, int y, int mode)
       if (!Key[element-EL_PFORTE1])
 	return(MF_NO_ACTION);
       break;
+
     case EL_PFORTE1X:
     case EL_PFORTE2X:
     case EL_PFORTE3X:
@@ -2178,34 +3267,129 @@ int DigField(int x, int y, int mode)
       if (!Key[element-EL_PFORTE1X])
 	return(MF_NO_ACTION);
       break;
+
     case EL_AUSGANG_ZU:
     case EL_AUSGANG_ACT:
       /* Tür ist (noch) nicht offen! */
       return(MF_NO_ACTION);
       break;
+
     case EL_AUSGANG_AUF:
-      if (mode==DF_SNAP || Gems>0)
+      if (mode==DF_SNAP)
 	return(MF_NO_ACTION);
-      LevelSolved = GameOver = TRUE;
+
+      PlayerGone = TRUE;
       PlaySoundLevel(x,y,SND_BUING);
+
+      if (!Friends)
+	LevelSolved = GameOver = TRUE;
+
       break;
+
     case EL_BIRNE_AUS:
       Feld[x][y] = EL_BIRNE_EIN;
+      Lights--;
       DrawLevelField(x,y);
       PlaySoundLevel(x,y,SND_DENG);
       return(MF_ACTION);
       break;
+
     case EL_ZEIT_VOLL:
       Feld[x][y] = EL_ZEIT_LEER;
+      TimeLeft += 10;
+      DrawText(DX_TIME,DY_TIME,int2str(TimeLeft,3),FS_SMALL,FC_YELLOW);
       DrawLevelField(x,y);
       PlaySoundStereo(SND_GONG,PSND_MAX_RIGHT);
       return(MF_ACTION);
       break;
+
+    case EL_SOKOBAN_FELD_LEER:
+      break;
+
+    case EL_SOKOBAN_FELD_VOLL:
+    case EL_SOKOBAN_OBJEKT:
+    case EL_SONDE:
+      if (mode==DF_SNAP)
+	return(MF_NO_ACTION);
+
+      PlayerPushing = TRUE;
+
+      if (!IN_LEV_FIELD(x+dx,y+dy)
+	  || (Feld[x+dx][y+dy] != EL_LEERRAUM
+	      && (Feld[x+dx][y+dy] != EL_SOKOBAN_FELD_LEER
+		  || !IS_SB_ELEMENT(element))))
+	return(MF_NO_ACTION);
+
+      if (dx && real_dy)
+      {
+	if (IN_LEV_FIELD(JX,JY+real_dy) && !IS_SOLID(Feld[JX][JY+real_dy]))
+	  return(MF_NO_ACTION);
+      }
+      else if (dy && real_dx)
+      {
+	if (IN_LEV_FIELD(JX+real_dx,JY) && !IS_SOLID(Feld[JX+real_dx][JY]))
+	  return(MF_NO_ACTION);
+      }
+
+      if (push_delay == 0)
+	push_delay = FrameCounter;
+      if (!FrameReached(&push_delay,push_delay_value) && !tape.playing)
+	return(MF_NO_ACTION);
+
+      if (IS_SB_ELEMENT(element))
+      {
+	if (element == EL_SOKOBAN_FELD_VOLL)
+	{
+	  Feld[x][y] = EL_SOKOBAN_FELD_LEER;
+	  SokobanFields++;
+	}
+	else
+	  Feld[x][y] = EL_LEERRAUM;
+
+	if (Feld[x+dx][y+dy] == EL_SOKOBAN_FELD_LEER)
+	{
+	  Feld[x+dx][y+dy] = EL_SOKOBAN_FELD_VOLL;
+	  SokobanFields--;
+	  if (element == EL_SOKOBAN_OBJEKT)
+	    PlaySoundLevel(x,y,SND_DENG);
+	}
+	else
+	  Feld[x+dx][y+dy] = EL_SOKOBAN_OBJEKT;
+      }
+      else
+      {
+	Feld[x][y] = EL_LEERRAUM;
+	Feld[x+dx][y+dy] = element;
+      }
+
+      push_delay_value = 2;
+
+      DrawLevelField(x,y);
+      DrawLevelField(x+dx,y+dy);
+      PlaySoundLevel(x+dx,y+dy,SND_PUSCH);
+
+      if (IS_SB_ELEMENT(element) &&
+	  SokobanFields == 0 && game_emulation == EMU_SOKOBAN)
+      {
+	LevelSolved = GameOver = TRUE;
+	PlaySoundLevel(x,y,SND_BUING);
+      }
+
+      break;
+
+    case EL_MAULWURF:
+    case EL_PINGUIN:
+    case EL_SCHWEIN:
+    case EL_DRACHE:
+      break;
+
     default:
       return(MF_NO_ACTION);
       break;
   }
-  push_delay=0;
+
+  push_delay = 0;
+
   return(MF_MOVING);
 }
 
@@ -2214,7 +3398,7 @@ BOOL SnapField(int dx, int dy)
   int x = JX+dx, y = JY+dy;
   static int snapped = FALSE;
 
-  if (GameOver || !IN_LEV_FIELD(x,y))
+  if (PlayerGone || !IN_LEV_FIELD(x,y))
     return(FALSE);
   if (dx && dy)
     return(FALSE);
@@ -2226,7 +3410,12 @@ BOOL SnapField(int dx, int dy)
   if (snapped)
     return(FALSE);
 
-  if (!DigField(x,y,DF_SNAP))
+  PlayerMovDir = (dx < 0 ? MV_LEFT :
+		  dx > 0 ? MV_RIGHT :
+		  dy < 0 ? MV_UP :
+		  dy > 0 ? MV_DOWN :	MV_NO_MOVING);
+
+  if (!DigField(x,y, 0,0, DF_SNAP))
     return(FALSE);
 
   snapped = TRUE;
@@ -2238,17 +3427,36 @@ BOOL SnapField(int dx, int dy)
 
 BOOL PlaceBomb(void)
 {
-  if (Dynamite==0 || Feld[JX][JY]==EL_DYNAMIT)
+  int element;
+
+  if (PlayerGone)
     return(FALSE);
 
-  if (Feld[JX][JY]!=EL_LEERRAUM)
-    Store[JX][JY] = Feld[JX][JY];
-  Feld[JX][JY] = EL_DYNAMIT;
-  MovDelay[JX][JY] = 48;
-  Dynamite--;
-  DrawText(DX_DYNAMITE,DY_DYNAMITE,int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
-  DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNAMIT);
-  CheckExploding = TRUE;
+  element = Feld[JX][JY];
+
+  if ((Dynamite==0 && DynaBombsLeft==0) ||
+      element==EL_DYNAMIT || element==EL_DYNABOMB || element==EL_EXPLODING)
+    return(FALSE);
+
+  if (element != EL_LEERRAUM)
+    Store[JX][JY] = element;
+
+  if (Dynamite)
+  {
+    Feld[JX][JY] = EL_DYNAMIT;
+    MovDelay[JX][JY] = 48;
+    Dynamite--;
+    DrawText(DX_DYNAMITE,DY_DYNAMITE,int2str(Dynamite,3),FS_SMALL,FC_YELLOW);
+    DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNAMIT);
+  }
+  else
+  {
+    Feld[JX][JY] = EL_DYNABOMB;
+    MovDelay[JX][JY] = 48;
+    DynaBombsLeft--;
+    DrawGraphicThruMask(SCROLLX(JX),SCROLLY(JY),GFX_DYNABOMB);
+  }
+
   return(TRUE);
 }
 
@@ -2256,11 +3464,15 @@ void PlaySoundLevel(int x, int y, int sound_nr)
 {
   int sx = SCROLLX(x), sy = SCROLLY(y);
   int volume, stereo;
+  int silence_distance = 8;
 
-  if (!sound_loops_on && IS_LOOP_SOUND(sound_nr))
+  if ((!sound_simple_on && !IS_LOOP_SOUND(sound_nr)) ||
+      (!sound_loops_on && IS_LOOP_SOUND(sound_nr)))
     return;
 
-  if (!IN_LEV_FIELD(x,y))
+  if (!IN_LEV_FIELD(x,y) ||
+      sx < -silence_distance || sx >= SCR_FIELDX+silence_distance ||
+      sy < -silence_distance || sy >= SCR_FIELDY+silence_distance)
     return;
 
   volume = PSND_MAX_VOLUME;
@@ -2268,10 +3480,10 @@ void PlaySoundLevel(int x, int y, int sound_nr)
 
   if (!IN_SCR_FIELD(sx,sy))
   {
-    if (sx<0 || sx>=SCR_FIELDX)
-      volume = PSND_MAX_VOLUME - 2*ABS(sx-SCR_FIELDX/2);
-    else
-      volume = PSND_MAX_VOLUME - 2*ABS(sy-SCR_FIELDY/2);
+    int dx = ABS(sx-SCR_FIELDX/2)-SCR_FIELDX/2;
+    int dy = ABS(sy-SCR_FIELDY/2)-SCR_FIELDY/2;
+
+    volume -= volume*(dx > dy ? dx : dy)/silence_distance;
   }
 
   PlaySoundExt(sound_nr, volume, stereo, PSND_NO_LOOP);
@@ -2284,196 +3496,44 @@ void RaiseScore(int value)
   BackToFront();
 }
 
-void TapeInitRecording()
-{
-  time_t zeit1 = time(NULL);
-  struct tm *zeit2 = localtime(&zeit1);
-
-  if (tape.recording || tape.playing)
-    return;
-
-  tape.level_nr = level_nr;
-  tape.recording = TRUE;
-  tape.pausing = TRUE;
-  tape.date =
-    10000*(zeit2->tm_year%100) + 100*zeit2->tm_mon + zeit2->tm_mday;
-
-  DrawVideoDisplay(VIDEO_STATE_REC_ON | VIDEO_STATE_PAUSE_ON,0);
-  DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-  DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
-}
-
-void TapeStartRecording()
-{
-  tape.length = 0;
-  tape.counter = 0;
-  tape.pos[tape.counter].delay = 0;
-  tape.recording = TRUE;
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
-  tape.random_seed = InitRND(NEW_RANDOMIZE);
-  DrawVideoDisplay(VIDEO_STATE_REC_ON | VIDEO_STATE_PAUSE_OFF,0);
-}
-
-void TapeStopRecording()
-{
-  if (!tape.recording)
-    return;
-
-  tape.length = tape.counter;
-  tape.recording = FALSE;
-  tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_REC_OFF,0);
-
-  master_tape = tape;
-}
-
-void TapeRecordAction(int joy)
-{
-  if (!tape.recording || tape.pausing)
-    return;
-
-  if (tape.counter>=MAX_TAPELEN-1)
-  {
-    TapeStopRecording();
-    return;
-  }
-
-  if (joy)
-  {
-    tape.pos[tape.counter].joystickdata = joy;
-    tape.counter++;
-    tape.pos[tape.counter].delay = 0;
-  }
-}
-
-void TapeRecordDelay()
-{
-  if (!tape.recording || tape.pausing)
-    return;
-
-  if (tape.counter>=MAX_TAPELEN)
-  {
-    TapeStopRecording();
-    return;
-  }
-
-  tape.pos[tape.counter].delay++;
-
-  if (tape.pos[tape.counter].delay>=255)
-  {
-    tape.pos[tape.counter].joystickdata = 0;
-    tape.counter++;
-    tape.pos[tape.counter].delay = 0;
-  }
-}
-
-void TapeTogglePause()
-{
-  if (!tape.recording && !tape.playing)
-    return;
-
-  if (tape.pausing)
-  {
-    tape.pausing = FALSE;
-    DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
-    if (game_status==MAINMENU)
-      HandleMainMenu(SX+16,SY+7*32+16,0,0,MB_MENU_CHOICE);
-  }
-  else
-  {
-    tape.pausing = TRUE;
-    DrawVideoDisplay(VIDEO_STATE_PAUSE_ON,0);
-  }
-}
-
-void TapeInitPlaying()
-{
-  if (tape.recording || tape.playing || TAPE_IS_EMPTY(tape))
-    return;
-
-  tape.playing = TRUE;
-  tape.pausing = TRUE;
-  DrawVideoDisplay(VIDEO_STATE_PLAY_ON | VIDEO_STATE_PAUSE_ON,0);
-  DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-  DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
-}
-
-void TapeStartPlaying()
+void RaiseScoreElement(int element)
 {
-  tape = master_tape;
-
-  tape.counter = 0;
-  tape.recording = FALSE;
-  tape.playing = TRUE;
-  tape.pausing = FALSE;
-  InitRND(tape.random_seed);
-  DrawVideoDisplay(VIDEO_STATE_PLAY_ON | VIDEO_STATE_PAUSE_OFF,0);
-}
-
-void TapeStopPlaying()
-{
-  if (!tape.playing)
-    return;
-
-  tape.playing = FALSE;
-  tape.pausing = FALSE;
-  DrawVideoDisplay(VIDEO_STATE_PLAY_OFF,0);
-}
-
-int TapePlayAction()
-{
-  if (!tape.playing || tape.pausing)
-    return(0);
-
-  if (tape.counter>=tape.length)
-  {
-    TapeStopPlaying();
-    return(0);
-  }
-
-  if (!tape.pos[tape.counter].delay)
-  {
-    tape.counter++;
-    return(tape.pos[tape.counter-1].joystickdata);
-  }
-  else
-    return(0);
-}
-
-BOOL TapePlayDelay()
-{
-  if (!tape.playing || tape.pausing)
-    return(0);
-
-  if (tape.counter>=tape.length)
-  {
-    TapeStopPlaying();
-    return(TRUE);
-  }
-
-  if (tape.pos[tape.counter].delay)
-  {
-    tape.pos[tape.counter].delay--;
-    return(TRUE);
-  }
-  else
-    return(FALSE);
-}
-
-void TapeStop()
-{
-  TapeStopRecording();
-  TapeStopPlaying();
-  DrawVideoDisplay(VIDEO_ALL_OFF,0);
-  if (tape.date && tape.length)
+  switch(element)
   {
-    DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
-    DrawVideoDisplay(VIDEO_STATE_TIME_ON,0);
+    case EL_EDELSTEIN:
+      RaiseScore(level.score[SC_EDELSTEIN]);
+      break;
+    case EL_DIAMANT:
+      RaiseScore(level.score[SC_DIAMANT]);
+      break;
+    case EL_KAEFER:
+    case EL_BUTTERFLY:
+      RaiseScore(level.score[SC_KAEFER]);
+      break;
+    case EL_FLIEGER:
+    case EL_FIREFLY:
+      RaiseScore(level.score[SC_FLIEGER]);
+      break;
+    case EL_MAMPFER:
+    case EL_MAMPFER2:
+      RaiseScore(level.score[SC_MAMPFER]);
+      break;
+    case EL_ROBOT:
+      RaiseScore(level.score[SC_ROBOT]);
+      break;
+    case EL_PACMAN:
+      RaiseScore(level.score[SC_PACMAN]);
+      break;
+    case EL_KOKOSNUSS:
+      RaiseScore(level.score[SC_KOKOSNUSS]);
+      break;
+    case EL_DYNAMIT:
+      RaiseScore(level.score[SC_DYNAMIT]);
+      break;
+    case EL_SCHLUESSEL:
+      RaiseScore(level.score[SC_SCHLUESSEL]);
+      break;
+    default:
+      break;
   }
 }
-
-void TapeErase()
-{
-  tape.length = 0;
-}