X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=02448c8bbb1ae3ab56a1f2ae1d0440dec51a666c;hb=1e196be4c0a2f1edf823b3a0e5a14a146317686e;hp=9897b56d78778dfa99cbe9dea30f99315560e1cf;hpb=cd47bf969c6d8c602b8f5dfa100f0be944bd0e46;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index 9897b56d..02448c8b 100644
--- a/src/game.c
+++ b/src/game.c
@@ -91,14 +91,6 @@
 #define SC_SCHLUESSEL		9
 #define SC_ZEITBONUS		10
 
-/* values for game_emulation */
-#define EMU_NONE		0
-#define EMU_BOULDERDASH		1
-#define EMU_SOKOBAN		2
-
-/* to control special behaviour of certain game elements */
-int game_emulation = EMU_NONE;
-
 
 
 
@@ -171,11 +163,151 @@ void GetPlayerConfig()
   InitJoysticks();
 }
 
+static void InitField(int x, int y, boolean init_game)
+{
+  switch (Feld[x][y])
+  {
+    case EL_SPIELFIGUR:
+    case EL_SP_MURPHY:
+      if (init_game)
+	Feld[x][y] = EL_SPIELER1;
+      /* no break! */
+    case EL_SPIELER1:
+    case EL_SPIELER2:
+    case EL_SPIELER3:
+    case EL_SPIELER4:
+      if (init_game)
+      {
+	struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_SPIELER1];
+	int jx = player->jx, jy = player->jy;
+
+	player->present = TRUE;
+
+	/*
+	if (!network_playing || player->connected)
+	*/
+
+	if (!options.network || player->connected)
+	{
+	  player->active = TRUE;
+
+	  /* remove potentially duplicate players */
+	  if (StorePlayer[jx][jy] == Feld[x][y])
+	    StorePlayer[jx][jy] = 0;
+
+	  StorePlayer[x][y] = Feld[x][y];
+
+	  if (options.verbose)
+	  {
+	    printf("Player %d activated.\n", player->element_nr);
+	    printf("[Local player is %d and currently %s.]\n",
+		   local_player->element_nr,
+		   local_player->active ? "active" : "not active");
+	  }
+	}
+
+	Feld[x][y] = EL_LEERRAUM;
+	player->jx = player->last_jx = x;
+	player->jy = player->last_jy = y;
+      }
+      break;
+
+    case EL_BADEWANNE:
+      if (x < lev_fieldx-1 && Feld[x+1][y] == EL_SALZSAEURE)
+	Feld[x][y] = EL_BADEWANNE1;
+      else if (x > 0 && Feld[x-1][y] == EL_SALZSAEURE)
+	Feld[x][y] = EL_BADEWANNE2;
+      else if (y > 0 && Feld[x][y-1] == EL_BADEWANNE1)
+	Feld[x][y] = EL_BADEWANNE3;
+      else if (y > 0 && Feld[x][y-1] == EL_SALZSAEURE)
+	Feld[x][y] = EL_BADEWANNE4;
+      else if (y > 0 && Feld[x][y-1] == EL_BADEWANNE2)
+	Feld[x][y] = EL_BADEWANNE5;
+      break;
+
+    case EL_KAEFER_R:
+    case EL_KAEFER_O:
+    case EL_KAEFER_L:
+    case EL_KAEFER_U:
+    case EL_KAEFER:
+    case EL_FLIEGER_R:
+    case EL_FLIEGER_O:
+    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_MAMPFER2:
+    case EL_ROBOT:
+    case EL_PACMAN:
+    case EL_SP_SNIKSNAK:
+    case EL_SP_ELECTRON:
+      InitMovDir(x, y);
+      break;
+
+    case EL_AMOEBE_VOLL:
+    case EL_AMOEBE_BD:
+      InitAmoebaNr(x, y);
+      break;
+
+    case EL_TROPFEN:
+      if (y == lev_fieldy - 1)
+      {
+	Feld[x][y] = EL_AMOEBING;
+	Store[x][y] = EL_AMOEBE_NASS;
+      }
+      break;
+
+    case EL_DYNAMIT:
+      MovDelay[x][y] = 96;
+      break;
+
+    case EL_BIRNE_AUS:
+      local_player->lights_still_needed++;
+      break;
+
+    case EL_SOKOBAN_FELD_LEER:
+      local_player->sokobanfields_still_needed++;
+      break;
+
+    case EL_MAULWURF:
+    case EL_PINGUIN:
+      local_player->friends_still_needed++;
+      break;
+
+    case EL_SCHWEIN:
+    case EL_DRACHE:
+      MovDir[x][y] = 1 << RND(4);
+      break;
+
+    case EL_SP_EMPTY:
+      Feld[x][y] = EL_LEERRAUM;
+      break;
+
+    default:
+      break;
+  }
+}
+
 void InitGame()
 {
   int i, j, x, y;
   boolean emulate_bd = TRUE;	/* unless non-BOULDERDASH elements found */
   boolean emulate_sb = TRUE;	/* unless non-SOKOBAN     elements found */
+  boolean emulate_sp = TRUE;	/* unless non-SUPAPLEX    elements found */
 
   /* don't play tapes over network */
   network_playing = (options.network && !tape.playing);
@@ -251,13 +383,27 @@ void InitGame()
   MampferNr = 0;
   FrameCounter = 0;
   TimeFrames = 0;
+  TimePlayed = 0;
   TimeLeft = level.time;
 
   ScreenMovDir = MV_NO_MOVING;
   ScreenMovPos = 0;
   ScreenGfxPos = 0;
 
-  AllPlayersGone = SiebAktiv = FALSE;
+  if (level.high_speed)
+  {
+    MoveSpeed = 4;
+    ScrollStepSize = TILEX/4;
+  }
+  else
+  {
+    MoveSpeed = 8;
+    ScrollStepSize = TILEX/8;
+  }
+
+  AllPlayersGone = FALSE;
+  SiebAktiv = FALSE;
+  SiebCount = 0;
 
   for (i=0; i<MAX_NUM_AMOEBA; i++)
     AmoebaCnt[i] = AmoebaCnt2[i] = 0;
@@ -276,129 +422,18 @@ void InitGame()
     }
   }
 
-  for(y=0; y<lev_fieldy; y++) for(x=0; x<lev_fieldx; x++)
+  for(y=0; y<lev_fieldy; y++)
   {
-    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])
+    for(x=0; x<lev_fieldx; x++)
     {
-      case EL_SPIELFIGUR:
-	Feld[x][y] = EL_SPIELER1;
-	/* no break! */
-      case EL_SPIELER1:
-      case EL_SPIELER2:
-      case EL_SPIELER3:
-      case EL_SPIELER4:
-      {
-	struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_SPIELER1];
-	int jx = player->jx, jy = player->jy;
-
-	player->present = TRUE;
-
-	/*
-	if (!network_playing || player->connected)
-	*/
-
-	if (!options.network || player->connected)
-	{
-	  player->active = TRUE;
-
-	  /* remove potentially duplicate players */
-	  if (StorePlayer[jx][jy] == Feld[x][y])
-	    StorePlayer[jx][jy] = 0;
-
-	  StorePlayer[x][y] = Feld[x][y];
-
-	  if (options.verbose)
-	  {
-	    printf("Player %d activated.\n", player->element_nr);
-	    printf("[Local player is %d and currently %s.]\n",
-		   local_player->element_nr,
-		   local_player->active ? "active" : "not active");
-	  }
-	}
-
-	Feld[x][y] = EL_LEERRAUM;
-	player->jx = player->last_jx = x;
-	player->jy = player->last_jy = y;
-
-	break;
-      }
-      case EL_BADEWANNE:
-	if (x < lev_fieldx-1 && Feld[x+1][y] == EL_SALZSAEURE)
-	  Feld[x][y] = EL_BADEWANNE1;
-	else if (x > 0 && Feld[x-1][y] == EL_SALZSAEURE)
-	  Feld[x][y] = EL_BADEWANNE2;
-	else if (y > 0 && Feld[x][y-1] == EL_BADEWANNE1)
-	  Feld[x][y] = EL_BADEWANNE3;
-	else if (y > 0 && Feld[x][y-1] == EL_SALZSAEURE)
-	  Feld[x][y] = EL_BADEWANNE4;
-	else if (y > 0 && Feld[x][y-1] == EL_BADEWANNE2)
-	  Feld[x][y] = EL_BADEWANNE5;
-	break;
-      case EL_KAEFER_R:
-      case EL_KAEFER_O:
-      case EL_KAEFER_L:
-      case EL_KAEFER_U:
-      case EL_KAEFER:
-      case EL_FLIEGER_R:
-      case EL_FLIEGER_O:
-      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_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:
-	if (y == lev_fieldy - 1)
-	{
-	  Feld[x][y] = EL_AMOEBING;
-	  Store[x][y] = EL_AMOEBE_NASS;
-	}
-	break;
-      case EL_DYNAMIT:
-	MovDelay[x][y] = 96;
-	break;
-      case EL_BIRNE_AUS:
-	local_player->lights_still_needed++;
-	break;
-      case EL_SOKOBAN_FELD_LEER:
-	local_player->sokobanfields_still_needed++;
-	break;
-      case EL_MAULWURF:
-      case EL_PINGUIN:
-	local_player->friends_still_needed++;
-	break;
-      case EL_SCHWEIN:
-      case EL_DRACHE:
-	MovDir[x][y] = 1 << RND(4);
-	break;
-      default:
-	break;
+      if (emulate_bd && !IS_BD_ELEMENT(Feld[x][y]))
+	emulate_bd = FALSE;
+      if (emulate_sb && !IS_SB_ELEMENT(Feld[x][y]))
+	emulate_sb = FALSE;
+      if (emulate_sp && !IS_SP_ELEMENT(Feld[x][y]))
+	emulate_sp = FALSE;
+
+      InitField(x, y, TRUE);
     }
   }
 
@@ -497,8 +532,56 @@ void InitGame()
   }
 
   game_emulation = (emulate_bd ? EMU_BOULDERDASH :
-		    emulate_sb ? EMU_SOKOBAN : EMU_NONE);
+		    emulate_sb ? EMU_SOKOBAN :
+		    emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
+
+  if (BorderElement == EL_LEERRAUM)
+  {
+    SBX_Left = 0;
+    SBX_Right = lev_fieldx - SCR_FIELDX;
+    SBY_Upper = 0;
+    SBY_Lower = lev_fieldy - SCR_FIELDY;
+  }
+  else
+  {
+    SBX_Left = -1;
+    SBX_Right = lev_fieldx - SCR_FIELDX + 1;
+    SBY_Upper = -1;
+    SBY_Lower = lev_fieldy - SCR_FIELDY + 1;
+  }
+
+  if (lev_fieldx < SCR_FIELDX)
+  {
+    SBX_Left = SBX_Right = -1 * (SCR_FIELDX - lev_fieldx) / 2;
+
+    /*
+    SBX_Left  -= (SCR_FIELDX - lev_fieldx) / 2;
+    SBX_Right -= (SCR_FIELDX - lev_fieldx) / 2;
+    */
+  }
+
+  if (lev_fieldy < SCR_FIELDY)
+  {
+    SBY_Upper = SBY_Lower = -1 * (SCR_FIELDY - lev_fieldy) / 2;
 
+    /*
+    SBY_Upper -= (SCR_FIELDY - lev_fieldy) / 2;
+    SBY_Lower -= (SCR_FIELDY - lev_fieldy) / 2;
+    */
+  }
+
+#if 1
+  scroll_x = SBX_Left;
+  scroll_y = SBY_Upper;
+  if (local_player->jx >= SBX_Left + MIDPOSX)
+    scroll_x = (local_player->jx <= SBX_Right + MIDPOSX ?
+		local_player->jx - MIDPOSX :
+		SBX_Right);
+  if (local_player->jy >= SBY_Upper + MIDPOSY)
+    scroll_y = (local_player->jy <= SBY_Lower + MIDPOSY ?
+		local_player->jy - MIDPOSY :
+		SBY_Lower);
+#else
   scroll_x = scroll_y = -1;
   if (local_player->jx >= MIDPOSX-1)
     scroll_x = (local_player->jx <= lev_fieldx-MIDPOSX ?
@@ -508,6 +591,7 @@ void InitGame()
     scroll_y = (local_player->jy <= lev_fieldy-MIDPOSY ?
 		local_player->jy - MIDPOSY :
 		lev_fieldy - SCR_FIELDY + 1);
+#endif
 
   CloseDoor(DOOR_CLOSE_1);
 
@@ -586,6 +670,7 @@ void InitMovDir(int x, int y)
       Feld[x][y] = EL_KAEFER;
       MovDir[x][y] = direction[0][element - EL_KAEFER_R];
       break;
+
     case EL_FLIEGER_R:
     case EL_FLIEGER_O:
     case EL_FLIEGER_L:
@@ -593,6 +678,7 @@ 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:
@@ -600,6 +686,7 @@ void InitMovDir(int x, int y)
       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:
@@ -607,6 +694,7 @@ void InitMovDir(int x, int y)
       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:
@@ -614,6 +702,15 @@ void InitMovDir(int x, int y)
       Feld[x][y] = EL_PACMAN;
       MovDir[x][y] = direction[0][element - EL_PACMAN_R];
       break;
+
+    case EL_SP_SNIKSNAK:
+      MovDir[x][y] = MV_UP;
+      break;
+
+    case EL_SP_ELECTRON:
+      MovDir[x][y] = MV_LEFT;
+      break;
+
     default:
       MovDir[x][y] = 1 << RND(4);
       if (element != EL_KAEFER &&
@@ -634,7 +731,8 @@ void InitMovDir(int x, int y)
 	    MovDir[x][y] = direction[0][i];
 	    break;
 	  }
-	  else if (element == EL_FLIEGER || element == EL_FIREFLY)
+	  else if (element == EL_FLIEGER || element == EL_FIREFLY ||
+		   element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
 	  {
 	    MovDir[x][y] = direction[1][i];
 	    break;
@@ -686,7 +784,7 @@ void GameWon()
     {
       if (!setup.sound_loops)
 	PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
-      if (TimeLeft && !(TimeLeft % 10))
+      if (TimeLeft > 0 && !(TimeLeft % 10))
 	RaiseScore(level.score[SC_ZEITBONUS]);
       if (TimeLeft > 100 && !(TimeLeft % 10))
 	TimeLeft -= 10;
@@ -700,6 +798,29 @@ void GameWon()
     if (setup.sound_loops)
       StopSound(SND_SIRR);
   }
+  else if (level.time == 0)		/* level without time limit */
+  {
+    if (setup.sound_loops)
+      PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
+
+    while(TimePlayed < 999)
+    {
+      if (!setup.sound_loops)
+	PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
+      if (TimePlayed < 999 && !(TimePlayed % 10))
+	RaiseScore(level.score[SC_ZEITBONUS]);
+      if (TimePlayed < 900 && !(TimePlayed % 10))
+	TimePlayed += 10;
+      else
+	TimePlayed++;
+      DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
+      BackToFront();
+      Delay(10);
+    }
+
+    if (setup.sound_loops)
+      StopSound(SND_SIRR);
+  }
 
   FadeSounds();
 
@@ -736,7 +857,7 @@ void GameWon()
   BackToFront();
 }
 
-boolean NewHiScore()
+int NewHiScore()
 {
   int k, l;
   int position = -1;
@@ -920,7 +1041,9 @@ void DrawDynamite(int x, int y)
       phase = 7 - phase;
   }
 
-  if (Store[x][y])
+  if (game_emulation == EMU_SUPAPLEX)
+    DrawGraphic(sx, sy, GFX_SP_DISK_RED);
+  else if (Store[x][y])
     DrawGraphicThruMask(sx, sy, graphic + phase);
   else
     DrawGraphic(sx, sy, graphic + phase);
@@ -976,7 +1099,7 @@ void Explode(int ex, int ey, int phase, int mode)
 	RemoveMovingField(x, y);
       }
 
-      if (!IN_LEV_FIELD(x, y) || IS_MASSIV(element) || element == EL_BURNING)
+      if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(element) || element == EL_BURNING)
 	continue;
 
       if ((mode!=EX_NORMAL || center_element == EL_AMOEBA2DIAM) &&
@@ -1004,6 +1127,9 @@ void Explode(int ex, int ey, int phase, int mode)
 	    Store[x][y] = EL_EDELSTEIN_GELB;
 	    break;
 	}
+
+	if (game_emulation == EMU_SUPAPLEX)
+	  Store[x][y] = EL_LEERRAUM;
       }
       else if (center_element == EL_MAULWURF)
 	Store[x][y] = EL_EDELSTEIN_ROT;
@@ -1013,6 +1139,8 @@ void Explode(int ex, int ey, int phase, int mode)
 	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_SP_ELECTRON)
+	Store[x][y] = EL_SP_INFOTRON;
       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)
@@ -1053,7 +1181,7 @@ void Explode(int ex, int ey, int phase, int mode)
     }
 
     if (center_element == EL_MAMPFER)
-      MampferNr = (MampferNr+1) % 4;
+      MampferNr = (MampferNr + 1) % MampferMax;
 
     return;
   }
@@ -1089,16 +1217,24 @@ void Explode(int ex, int ey, int phase, int mode)
     element = Feld[x][y] = Store[x][y];
     Store[x][y] = Store2[x][y] = 0;
     MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = 0;
+    InitField(x, y, FALSE);
     if (CAN_MOVE(element) || COULD_MOVE(element))
       InitMovDir(x, y);
     DrawLevelField(x, y);
   }
-  else if (!(phase%delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+  else if (!(phase % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
   {
+    int graphic = GFX_EXPLOSION;
+
+    if (game_emulation == EMU_SUPAPLEX)
+      graphic = (Store[x][y] == EL_SP_INFOTRON ?
+		 GFX_SP_EXPLODE_INFOTRON :
+		 GFX_SP_EXPLODE_EMPTY);
+
     if (phase == delay)
       ErdreichAnbroeckeln(SCREENX(x), SCREENY(y));
 
-    DrawGraphic(SCREENX(x), SCREENY(y), GFX_EXPLOSION+(phase/delay-1));
+    DrawGraphic(SCREENX(x), SCREENY(y), graphic + (phase / delay - 1));
   }
 }
 
@@ -1126,7 +1262,7 @@ void DynaExplode(int ex, int ey)
       int y = ey+j*xy[i%4][1];
       int element;
 
-      if (!IN_LEV_FIELD(x, y) || IS_MASSIV(Feld[x][y]))
+      if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(Feld[x][y]))
 	break;
 
       element = Feld[x][y];
@@ -1147,7 +1283,10 @@ void Bang(int x, int y)
 {
   int element = Feld[x][y];
 
-  PlaySoundLevel(x, y, SND_ROAAAR);
+  if (game_emulation == EMU_SUPAPLEX)
+    PlaySoundLevel(x, y, SND_SP_BOOOM);
+  else
+    PlaySoundLevel(x, y, SND_ROAAAR);
 
   if (IS_PLAYER(x, y))	/* remove objects that might cause smaller explosion */
     element = EL_LEERRAUM;
@@ -1250,7 +1389,8 @@ void Impact(int x, int y)
     return;
   }
 
-  if (element == EL_BOMBE && (lastline || object_hit))	/* element is bomb */
+  if ((element == EL_BOMBE || element == EL_SP_DISK_ORANGE) &&
+      (lastline || object_hit))	/* element is bomb */
   {
     Bang(x, y);
     return;
@@ -1273,8 +1413,22 @@ void Impact(int x, int y)
   if (!lastline && object_hit)		/* check which object was hit */
   {
     if (CAN_CHANGE(element) && 
-	(smashed == EL_SIEB_LEER || smashed == EL_SIEB2_LEER) && !SiebAktiv)
-      SiebAktiv = level.dauer_sieb * FRAMES_PER_SECOND;
+	(smashed == EL_SIEB_INAKTIV || smashed == EL_SIEB2_INAKTIV))
+    {
+      int x, y;
+      int activated_magic_wall =
+	(smashed == EL_SIEB_INAKTIV ? EL_SIEB_LEER : EL_SIEB2_LEER);
+
+      /* activate magic wall / mill */
+
+      for (y=0; y<lev_fieldy; y++)
+	for (x=0; x<lev_fieldx; x++)
+	  if (Feld[x][y] == smashed)
+	    Feld[x][y] = activated_magic_wall;
+
+      SiebCount = level.dauer_sieb * FRAMES_PER_SECOND;
+      SiebAktiv = TRUE;
+    }
 
     if (IS_PLAYER(x, y+1))
     {
@@ -1294,10 +1448,11 @@ void Impact(int x, int y)
 	return;
       }
     }
-    else if (element == EL_FELSBROCKEN)
+    else if (element == EL_FELSBROCKEN || element == EL_SP_ZONK)
     {
-      if (IS_ENEMY(smashed) || smashed == EL_BOMBE || smashed == EL_SONDE ||
-	  smashed == EL_SCHWEIN || smashed == EL_DRACHE)
+      if (IS_ENEMY(smashed) ||
+	  smashed == EL_BOMBE || smashed == EL_SP_DISK_ORANGE ||
+	  smashed == EL_SONDE || smashed == EL_SCHWEIN || smashed == EL_DRACHE)
       {
 	Bang(x, y+1);
 	return;
@@ -1347,6 +1502,7 @@ void Impact(int x, int y)
       case EL_EDELSTEIN_ROT:
       case EL_EDELSTEIN_LILA:
       case EL_DIAMANT:
+      case EL_SP_INFOTRON:
         sound = SND_PLING;
 	break;
       case EL_KOKOSNUSS:
@@ -1355,6 +1511,9 @@ void Impact(int x, int y)
       case EL_FELSBROCKEN:
 	sound = SND_KLOPF;
 	break;
+      case EL_SP_ZONK:
+	sound = SND_SP_ZONKDOWN;
+	break;
       case EL_SCHLUESSEL:
       case EL_SCHLUESSEL1:
       case EL_SCHLUESSEL2:
@@ -1436,7 +1595,8 @@ void TurnRound(int x, int y)
     else if (element == EL_BUTTERFLY)	/* && MovDir[x][y] == left_dir) */
       MovDelay[x][y] = 1;
   }
-  else if (element == EL_FLIEGER || element == EL_FIREFLY)
+  else if (element == EL_FLIEGER || element == EL_FIREFLY ||
+	   element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
   {
     TestIfBadThingHitsOtherBadThing(x, y);
 
@@ -1447,7 +1607,9 @@ void TurnRound(int x, int y)
 	     !IS_FREE_OR_PLAYER(move_x, move_y))
       MovDir[x][y] = right_dir;
 
-    if (element == EL_FLIEGER && MovDir[x][y] != old_move_dir)
+    if ((element == EL_FLIEGER ||
+	 element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
+	&& MovDir[x][y] != old_move_dir)
       MovDelay[x][y] = 9;
     else if (element == EL_FIREFLY)	/* && MovDir[x][y] == right_dir) */
       MovDelay[x][y] = 1;
@@ -1867,7 +2029,7 @@ void StartMoving(int x, int y)
 	Store2[x][y] = 0;
       }
     }
-    else if (SiebAktiv && CAN_CHANGE(element) &&
+    else if (CAN_CHANGE(element) &&
 	     (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER))
     {
       InitMovingField(x, y, MV_DOWN);
@@ -1925,7 +2087,9 @@ void StartMoving(int x, int y)
       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 ||
+			       element == EL_SP_SNIKSNAK ||
+			       element == EL_SP_ELECTRON))
 	  DrawLevelField(x, y);
       }
     }
@@ -1934,8 +2098,8 @@ void StartMoving(int x, int y)
     {
       MovDelay[x][y]--;
 
-      if (element == EL_ROBOT || element == EL_MAMPFER ||
-	  element == EL_MAMPFER2)
+      if (element == EL_ROBOT ||
+	  element == EL_MAMPFER || element == EL_MAMPFER2)
       {
 	int phase = MovDelay[x][y] % 8;
 
@@ -1949,6 +2113,8 @@ void StartMoving(int x, int y)
 	    && MovDelay[x][y]%4 == 3)
 	  PlaySoundLevel(x, y, SND_NJAM);
       }
+      else if (element == EL_SP_ELECTRON)
+	DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
       else if (element == EL_DRACHE)
       {
 	int i;
@@ -2170,12 +2336,15 @@ void StartMoving(int x, int y)
 
       TurnRound(x, y);
 
-      if (element == EL_KAEFER || element == EL_FLIEGER)
+      if (element == EL_KAEFER || element == EL_FLIEGER ||
+	  element == EL_SP_SNIKSNAK)
 	DrawLevelField(x, y);
       else if (element == EL_BUTTERFLY || element == EL_FIREFLY)
 	DrawGraphicAnimation(x, y, el2gfx(element), 2, 4, ANIM_NORMAL);
       else if (element == EL_SONDE)
 	DrawGraphicAnimation(x, y, GFX_SONDE_START, 8, 2, ANIM_NORMAL);
+      else if (element == EL_SP_ELECTRON)
+	DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
 
       return;
     }
@@ -2200,7 +2369,7 @@ void ContinueMoving(int x, int y)
   int newx = x + dx, newy = y + dy;
   int step = (horiz_move ? dx : dy) * TILEX/8;
 
-  if (CAN_FALL(element) && horiz_move)
+  if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element))
     step*=2;
   else if (element == EL_TROPFEN)
     step/=2;
@@ -2301,13 +2470,13 @@ int AmoebeNachbarNr(int ax, int ay)
 
   for (i=0; i<4; i++)
   {
-    int x = ax+xy[i%4][0];
-    int y = ay+xy[i%4][1];
+    int x = ax + xy[i][0];
+    int y = ay + xy[i][1];
 
     if (!IN_LEV_FIELD(x, y))
       continue;
 
-    if (Feld[x][y] == element && AmoebaNr[x][y]>0)
+    if (Feld[x][y] == element && AmoebaNr[x][y] > 0)
       group_nr = AmoebaNr[x][y];
   }
 
@@ -2326,13 +2495,13 @@ void AmoebenVereinigen(int ax, int ay)
     { 0, +1 }
   };
 
-  if (!new_group_nr)
+  if (new_group_nr == 0)
     return;
 
   for (i=0; i<4; i++)
   {
-    x = ax+xy[i%4][0];
-    y = ay+xy[i%4][1];
+    x = ax + xy[i][0];
+    y = ay + xy[i][1];
 
     if (!IN_LEV_FIELD(x, y))
       continue;
@@ -2344,14 +2513,22 @@ void AmoebenVereinigen(int ax, int ay)
     {
       int old_group_nr = AmoebaNr[x][y];
 
+      if (old_group_nr == 0)
+	return;
+
       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)
-	  AmoebaNr[xx][yy] = new_group_nr;
+      for (yy=0; yy<lev_fieldy; yy++)
+      {
+	for (xx=0; xx<lev_fieldx; xx++)
+	{
+	  if (AmoebaNr[xx][yy] == old_group_nr)
+	    AmoebaNr[xx][yy] = new_group_nr;
+	}
+      }
     }
   }
 }
@@ -2359,33 +2536,47 @@ void AmoebenVereinigen(int ax, int ay)
 void AmoebeUmwandeln(int ax, int ay)
 {
   int i, x, y;
-  int group_nr = AmoebaNr[ax][ay];
-  static int xy[4][2] =
-  {
-    { 0, -1 },
-    { -1, 0 },
-    { +1, 0 },
-    { 0, +1 }
-  };
 
   if (Feld[ax][ay] == EL_AMOEBE_TOT)
   {
-    for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+    int group_nr = AmoebaNr[ax][ay];
+
+#ifdef DEBUG
+    if (group_nr == 0)
+    {
+      printf("AmoebeUmwandeln(): ax = %d, ay = %d\n", ax, ay);
+      printf("AmoebeUmwandeln(): This should never happen!\n");
+      return;
+    }
+#endif
+
+    for (y=0; y<lev_fieldy; y++)
     {
-      if (Feld[x][y] == EL_AMOEBE_TOT && AmoebaNr[x][y] == group_nr)
+      for (x=0; x<lev_fieldx; x++)
       {
-	AmoebaNr[x][y] = 0;
-	Feld[x][y] = EL_AMOEBA2DIAM;
+	if (Feld[x][y] == EL_AMOEBE_TOT && AmoebaNr[x][y] == group_nr)
+	{
+	  AmoebaNr[x][y] = 0;
+	  Feld[x][y] = EL_AMOEBA2DIAM;
+	}
       }
     }
     Bang(ax, ay);
   }
   else
   {
+    static int xy[4][2] =
+    {
+      { 0, -1 },
+      { -1, 0 },
+      { +1, 0 },
+      { 0, +1 }
+    };
+
     for (i=0; i<4; i++)
     {
-      x = ax+xy[i%4][0];
-      y = ay+xy[i%4][1];
+      x = ax + xy[i][0];
+      y = ay + xy[i][1];
 
       if (!IN_LEV_FIELD(x, y))
 	continue;
@@ -2396,23 +2587,36 @@ void AmoebeUmwandeln(int ax, int ay)
   }
 }
 
-void AmoebeUmwandeln2(int ax, int ay, int new_element)
+void AmoebeUmwandelnBD(int ax, int ay, int new_element)
 {
   int x, y;
   int group_nr = AmoebaNr[ax][ay];
   boolean done = FALSE;
 
-  for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+#ifdef DEBUG
+  if (group_nr == 0)
   {
-    if (AmoebaNr[x][y] == group_nr &&
-	(Feld[x][y] == EL_AMOEBE_TOT ||
-	 Feld[x][y] == EL_AMOEBE_BD ||
-	 Feld[x][y] == EL_AMOEBING))
+    printf("AmoebeUmwandelnBD(): ax = %d, ay = %d\n", ax, ay);
+    printf("AmoebeUmwandelnBD(): This should never happen!\n");
+    return;
+  }
+#endif
+
+  for (y=0; y<lev_fieldy; y++)
+  {
+    for (x=0; x<lev_fieldx; x++)
     {
-      AmoebaNr[x][y] = 0;
-      Feld[x][y] = new_element;
-      DrawLevelField(x, y);
-      done = TRUE;
+      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;
+	InitField(x, y, FALSE);
+	DrawLevelField(x, y);
+	done = TRUE;
+      }
     }
   }
 
@@ -2441,7 +2645,7 @@ void AmoebeWaechst(int x, int y)
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-      DrawGraphic(SCREENX(x), SCREENY(y), GFX_AMOEBING+3-MovDelay[x][y]/2);
+      DrawGraphic(SCREENX(x), SCREENY(y), GFX_AMOEBING + 3 - MovDelay[x][y]/2);
 
     if (!MovDelay[x][y])
     {
@@ -2473,7 +2677,7 @@ void AmoebeAbleger(int ax, int ay)
   }
 
   if (!MovDelay[ax][ay])	/* start making new amoeba field */
-    MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25/(1+level.tempo_amoebe));
+    MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.tempo_amoebe));
 
   if (MovDelay[ax][ay])		/* wait some time before making new amoeba */
   {
@@ -2485,8 +2689,8 @@ void AmoebeAbleger(int ax, int ay)
   if (element == EL_AMOEBE_NASS)	/* object is an acid / amoeba drop */
   {
     int start = RND(4);
-    int x = ax+xy[start][0];
-    int y = ay+xy[start][1];
+    int x = ax + xy[start][0];
+    int y = ay + xy[start][1];
 
     if (!IN_LEV_FIELD(x, y))
       return;
@@ -2501,16 +2705,16 @@ void AmoebeAbleger(int ax, int ay)
     if (newax == ax && neway == ay)
       return;
   }
-  else				/* normal or "filled" amoeba */
+  else				/* normal or "filled" (BD style) amoeba */
   {
     int start = RND(4);
     boolean waiting_for_player = FALSE;
 
     for (i=0; i<4; i++)
     {
-      int j = (start+i)%4;
-      int x = ax+xy[j][0];
-      int y = ay+xy[j][1];
+      int j = (start + i) % 4;
+      int x = ax + xy[j][0];
+      int y = ay + xy[j][1];
 
       if (!IN_LEV_FIELD(x, y))
 	continue;
@@ -2526,43 +2730,56 @@ void AmoebeAbleger(int ax, int ay)
 	waiting_for_player = TRUE;
     }
 
-    if (newax == ax && neway == ay)
+    if (newax == ax && neway == ay)		/* amoeba cannot grow */
     {
-      if (i == 4 && !waiting_for_player)
+      if (i == 4 && (!waiting_for_player || game_emulation == EMU_BOULDERDASH))
       {
 	Feld[ax][ay] = EL_AMOEBE_TOT;
 	DrawLevelField(ax, ay);
 	AmoebaCnt[AmoebaNr[ax][ay]]--;
 
-	if (AmoebaCnt[AmoebaNr[ax][ay]]<=0)	/* amoeba is completely dead */
+	if (AmoebaCnt[AmoebaNr[ax][ay]] <= 0)	/* amoeba is completely dead */
 	{
 	  if (element == EL_AMOEBE_VOLL)
 	    AmoebeUmwandeln(ax, ay);
 	  else if (element == EL_AMOEBE_BD)
-	    AmoebeUmwandeln2(ax, ay, level.amoebe_inhalt);
+	    AmoebeUmwandelnBD(ax, ay, level.amoebe_inhalt);
 	}
       }
       return;
     }
     else if (element == EL_AMOEBE_VOLL || element == EL_AMOEBE_BD)
     {
+      /* amoeba gets larger by growing in some direction */
+
       int new_group_nr = AmoebaNr[ax][ay];
 
+#ifdef DEBUG
+  if (new_group_nr == 0)
+  {
+    printf("AmoebeAbleger(): newax = %d, neway = %d\n", newax, neway);
+    printf("AmoebeAbleger(): This should never happen!\n");
+    return;
+  }
+#endif
+
       AmoebaNr[newax][neway] = new_group_nr;
       AmoebaCnt[new_group_nr]++;
       AmoebaCnt2[new_group_nr]++;
+
+      /* if amoeba touches other amoeba(s) after growing, unify them */
       AmoebenVereinigen(newax, neway);
 
-      if (AmoebaCnt2[new_group_nr] >= 200 && element == EL_AMOEBE_BD)
+      if (element == EL_AMOEBE_BD && AmoebaCnt2[new_group_nr] >= 200)
       {
-	AmoebeUmwandeln2(newax, neway, EL_FELSBROCKEN);
+	AmoebeUmwandelnBD(newax, neway, EL_FELSBROCKEN);
 	return;
       }
     }
   }
 
-  if (element!=EL_AMOEBE_NASS || neway<ay || !IS_FREE(newax, neway) ||
-      (neway == lev_fieldy-1 && newax!=ax))
+  if (element != EL_AMOEBE_NASS || neway < ay || !IS_FREE(newax, neway) ||
+      (neway == lev_fieldy - 1 && newax != ax))
   {
     Feld[newax][neway] = EL_AMOEBING;
     Store[newax][neway] = element;
@@ -2729,10 +2946,9 @@ void NussKnacken(int x, int y)
 
 void SiebAktivieren(int x, int y, int typ)
 {
-  if (!(SiebAktiv % 4) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    DrawGraphic(SCREENX(x), SCREENY(y),
-		(typ == 1 ? GFX_SIEB_VOLL :
-		 GFX_SIEB2_VOLL) + 3 - (SiebAktiv % 16) / 4);
+  int graphic = (typ == 1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL) + 3;
+
+  DrawGraphicAnimation(x, y, graphic, 4, 4, ANIM_REVERSE);
 }
 
 void AusgangstuerPruefen(int x, int y)
@@ -3013,6 +3229,68 @@ void CheckForDragon(int x, int y)
   }
 }
 
+static void CheckBuggyBase(int x, int y)
+{
+  int element = Feld[x][y];
+
+  if (element == EL_SP_BUG)
+  {
+    if (!MovDelay[x][y])	/* start activating buggy base */
+      MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
+
+    if (MovDelay[x][y])		/* wait some time before activating base */
+    {
+      MovDelay[x][y]--;
+      if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+	DrawGraphic(SCREENX(x), SCREENY(y), GFX_SP_BUG_WARNING);
+      if (MovDelay[x][y])
+	return;
+
+      Feld[x][y] = EL_SP_BUG_ACTIVE;
+    }
+  }
+  else if (element == EL_SP_BUG_ACTIVE)
+  {
+    if (!MovDelay[x][y])	/* start activating buggy base */
+      MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND);
+
+    if (MovDelay[x][y])		/* wait some time before activating base */
+    {
+      MovDelay[x][y]--;
+      if (MovDelay[x][y])
+      {
+	int i;
+	static int xy[4][2] =
+	{
+	  { 0, -1 },
+	  { -1, 0 },
+	  { +1, 0 },
+	  { 0, +1 }
+	};
+
+	if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+	  DrawGraphic(SCREENX(x),SCREENY(y), GFX_SP_BUG_ACTIVE + SimpleRND(4));
+
+	for (i=0; i<4; i++)
+	{
+	  int xx = x + xy[i][0], yy = y + xy[i][1];
+
+	  if (IS_PLAYER(xx, yy))
+	  {
+	    PlaySoundLevel(x, y, SND_SP_BUG);
+	    break;
+	  }
+	}
+
+	return;
+      }
+
+      Feld[x][y] = EL_SP_BUG;
+      DrawLevelField(x, y);
+    }
+  }
+}
+
 static void PlayerActions(struct PlayerInfo *player, byte player_action)
 {
   static byte stored_player_action[MAX_PLAYERS];
@@ -3256,9 +3534,9 @@ void GameActions()
     extern unsigned int last_RND();
 
     printf("DEBUG: %03d last RND was %d \t [state checksum is %d]\n",
-	   level.time - TimeLeft,
+	   TimePlayed,
 	   last_RND(),
-	   getStateCheckSum(level.time - TimeLeft));
+	   getStateCheckSum(TimePlayed));
   }
   */
 #endif
@@ -3351,6 +3629,12 @@ void GameActions()
       MauerAbleger(x, y);
     else if (element == EL_BURNING)
       CheckForDragon(x, y);
+    else if (element == EL_SP_BUG || element == EL_SP_BUG_ACTIVE)
+      CheckBuggyBase(x, y);
+    else if (element == EL_SP_TERMINAL)
+      DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL, 7, 12, ANIM_NORMAL);
+    else if (element == EL_SP_TERMINAL_ACTIVE)
+      DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL_ACTIVE, 7, 4, ANIM_NORMAL);
 
     if (SiebAktiv)
     {
@@ -3381,44 +3665,57 @@ void GameActions()
 
   if (SiebAktiv)
   {
-    if (!(SiebAktiv%4))
+    if (!(SiebCount % 4))
       PlaySoundLevel(sieb_x, sieb_y, SND_MIEP);
-    SiebAktiv--;
-    if (!SiebAktiv)
+
+    if (SiebCount > 0)
     {
-      for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+      SiebCount--;
+      if (!SiebCount)
       {
-	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)
+	for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
 	{
-	  Feld[x][y] = EL_SIEB2_TOT;
-	  DrawLevelField(x, y);
+	  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);
+	  }
 	}
+
+	SiebAktiv = FALSE;
       }
     }
   }
 
-  if (TimeLeft>0 && TimeFrames>=(1000/GameFrameDelay) && !tape.pausing)
+  if (TimeFrames >= (1000 / GameFrameDelay) && !tape.pausing)
   {
     TimeFrames = 0;
-    TimeLeft--;
+    TimePlayed++;
 
     if (tape.recording || tape.playing)
-      DrawVideoDisplay(VIDEO_STATE_TIME_ON, level.time-TimeLeft);
+      DrawVideoDisplay(VIDEO_STATE_TIME_ON, TimePlayed);
 
-    if (TimeLeft<=10)
-      PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+    if (TimeLeft > 0)
+    {
+      TimeLeft--;
 
-    DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+      if (TimeLeft <= 10)
+	PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
 
-    if (!TimeLeft)
-      for (i=0; i<MAX_PLAYERS; i++)
-	KillHero(&stored_player[i]);
+      DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+
+      if (!TimeLeft)
+	for (i=0; i<MAX_PLAYERS; i++)
+	  KillHero(&stored_player[i]);
+    }
+    else if (level.time == 0)		/* level without time limit */
+      DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
   }
 
   DrawAllPlayers();
@@ -3545,7 +3842,7 @@ boolean MoveFigureOneStep(struct PlayerInfo *player,
   jy = player->jy = new_jy;
   StorePlayer[jx][jy] = player->element_nr;
 
-  player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * 7*TILEX/8;
+  player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / MoveSpeed);
 
   ScrollFigure(player, SCROLL_INIT);
 
@@ -3569,10 +3866,15 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     /* should only happen if pre-1.2 tape recordings are played */
     /* this is only for backward compatibility */
 
+    int old_move_speed = MoveSpeed;
+
 #if DEBUG
     printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES.\n");
 #endif
 
+    /* scroll remaining steps with finest movement resolution */
+    MoveSpeed = 8;
+
     while (player->MovPos)
     {
       ScrollFigure(player, SCROLL_GO_ON);
@@ -3581,6 +3883,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
       DrawAllPlayers();
       BackToFront();
     }
+
+    MoveSpeed = old_move_speed;
   }
 
   if (player->last_move_dir & (MV_LEFT | MV_RIGHT))
@@ -3619,9 +3923,15 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
 	    (player->MovDir == MV_RIGHT && scroll_x < jx-MIDPOSX-offset))
 	  scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
 
+#if 1
+	/* don't scroll over playfield boundaries */
+	if (scroll_x < SBX_Left || scroll_x > SBX_Right)
+	  scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right);
+#else
 	/* don't scroll over playfield boundaries */
 	if (scroll_x < -1 || scroll_x > lev_fieldx - SCR_FIELDX + 1)
 	  scroll_x = (scroll_x < -1 ? -1 : lev_fieldx - SCR_FIELDX + 1);
+#endif
 
 	/* don't scroll more than one field at a time */
 	scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
@@ -3637,9 +3947,15 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
 	    (player->MovDir == MV_DOWN && scroll_y < jy-MIDPOSY-offset))
 	  scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
 
+#if 1
+	/* don't scroll over playfield boundaries */
+	if (scroll_y < SBY_Upper || scroll_y > SBY_Lower)
+	  scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower);
+#else
 	/* don't scroll over playfield boundaries */
 	if (scroll_y < -1 || scroll_y > lev_fieldy - SCR_FIELDY + 1)
 	  scroll_y = (scroll_y < -1 ? -1 : lev_fieldy - SCR_FIELDY + 1);
+#endif
 
 	/* don't scroll more than one field at a time */
 	scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);
@@ -3715,7 +4031,7 @@ void ScrollFigure(struct PlayerInfo *player, int mode)
   else if (!FrameReached(&player->actual_frame_counter, 1))
     return;
 
-  player->MovPos += (player->MovPos > 0 ? -1 : 1) * TILEX/8;
+  player->MovPos += (player->MovPos > 0 ? -1 : 1) * TILEX / MoveSpeed;
   player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize);
 
   if (Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING)
@@ -3755,7 +4071,7 @@ void ScrollScreen(struct PlayerInfo *player, int mode)
 
   if (ScreenMovPos)
   {
-    ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * TILEX/8;
+    ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * TILEX / MoveSpeed;
     ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize);
     redraw_mask |= REDRAW_FIELD;
   }
@@ -3992,10 +4308,18 @@ int DigField(struct PlayerInfo *player,
   switch(element)
   {
     case EL_LEERRAUM:
+      PlaySoundLevel(x, y, SND_EMPTY);
       break;
 
     case EL_ERDREICH:
       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);
       break;
 
     case EL_EDELSTEIN:
@@ -4004,6 +4328,7 @@ int DigField(struct PlayerInfo *player,
     case EL_EDELSTEIN_ROT:
     case EL_EDELSTEIN_LILA:
     case EL_DIAMANT:
+    case EL_SP_INFOTRON:
       RemoveField(x, y);
       local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 : 1);
       if (local_player->gems_still_needed < 0)
@@ -4012,17 +4337,31 @@ 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);
+      break;
+
+    case EL_SPEED_PILL:
+      RemoveField(x, y);
+      MoveSpeed = 4;
+      ScrollStepSize = TILEX/4;
       PlaySoundLevel(x, y, SND_PONG);
       break;
 
     case EL_DYNAMIT_AUS:
+    case EL_SP_DISK_RED:
       RemoveField(x, y);
       player->dynamite++;
       RaiseScoreElement(EL_DYNAMIT);
       DrawText(DX_DYNAMITE, DY_DYNAMITE,
 	       int2str(local_player->dynamite, 3),
 	       FS_SMALL, FC_YELLOW);
-      PlaySoundLevel(x, y, SND_PONG);
+      if (element == EL_SP_DISK_RED)
+	PlaySoundLevel(x, y, SND_SP_INFOTRON);
+      else
+	PlaySoundLevel(x, y, SND_PONG);
       break;
 
     case EL_DYNABOMB_NR:
@@ -4075,10 +4414,39 @@ int DigField(struct PlayerInfo *player,
       return MF_ACTION;
       break;
 
+    case EL_SP_TERMINAL:
+      {
+	int xx, yy;
+
+	for (yy=0; yy<lev_fieldy; yy++)
+	{
+	  for (xx=0; xx<lev_fieldx; xx++)
+	  {
+	    if (Feld[xx][yy] == EL_SP_DISK_YELLOW)
+	      Bang(xx, yy);
+	    else if (Feld[xx][yy] == EL_SP_TERMINAL)
+	      Feld[xx][yy] = EL_SP_TERMINAL_ACTIVE;
+	  }
+	}
+
+	return MF_ACTION;
+      }
+      break;
+
+    case EL_SP_EXIT:
+      if (local_player->gems_still_needed > 0)
+	return MF_NO_ACTION;
+
+      player->LevelSolved = player->GameOver = TRUE;
+      PlaySoundStereo(SND_SP_EXIT, PSND_MAX_RIGHT);
+      break;
+
     case EL_FELSBROCKEN:
     case EL_BOMBE:
     case EL_KOKOSNUSS:
     case EL_ZEIT_LEER:
+    case EL_SP_ZONK:
+    case EL_SP_DISK_ORANGE:
       if (dy || mode == DF_SNAP)
 	return MF_NO_ACTION;
 
@@ -4109,6 +4477,8 @@ int DigField(struct PlayerInfo *player,
 	PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
       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_KLOPF);
       break;
@@ -4129,6 +4499,42 @@ int DigField(struct PlayerInfo *player,
 	return MF_NO_ACTION;
       break;
 
+    case EL_SP_PORT1_LEFT:
+    case EL_SP_PORT2_LEFT:
+    case EL_SP_PORT1_RIGHT:
+    case EL_SP_PORT2_RIGHT:
+    case EL_SP_PORT1_UP:
+    case EL_SP_PORT2_UP:
+    case EL_SP_PORT1_DOWN:
+    case EL_SP_PORT2_DOWN:
+    case EL_SP_PORT_X:
+    case EL_SP_PORT_Y:
+    case EL_SP_PORT_XY:
+      if ((dx == -1 &&
+	   element != EL_SP_PORT1_LEFT &&
+	   element != EL_SP_PORT2_LEFT &&
+	   element != EL_SP_PORT_X &&
+	   element != EL_SP_PORT_XY) ||
+	  (dx == +1 &&
+	   element != EL_SP_PORT1_RIGHT &&
+	   element != EL_SP_PORT2_RIGHT &&
+	   element != EL_SP_PORT_X &&
+	   element != EL_SP_PORT_XY) ||
+	  (dy == -1 &&
+	   element != EL_SP_PORT1_UP &&
+	   element != EL_SP_PORT2_UP &&
+	   element != EL_SP_PORT_Y &&
+	   element != EL_SP_PORT_XY) ||
+	  (dy == +1 &&
+	   element != EL_SP_PORT1_DOWN &&
+	   element != EL_SP_PORT2_DOWN &&
+	   element != EL_SP_PORT_Y &&
+	   element != EL_SP_PORT_XY) ||
+	  !IN_LEV_FIELD(x + dx, y + dy) ||
+	  !IS_FREE(x + dx, y + dy))
+	return MF_NO_ACTION;
+      break;
+
     case EL_AUSGANG_ZU:
     case EL_AUSGANG_ACT:
       /* door is not (yet) open */
@@ -4174,6 +4580,7 @@ int DigField(struct PlayerInfo *player,
     case EL_SOKOBAN_FELD_VOLL:
     case EL_SOKOBAN_OBJEKT:
     case EL_SONDE:
+    case EL_SP_DISK_YELLOW:
       if (mode == DF_SNAP)
 	return MF_NO_ACTION;
 
@@ -4252,7 +4659,6 @@ int DigField(struct PlayerInfo *player,
 
     default:
       return MF_NO_ACTION;
-      break;
   }
 
   player->push_delay = 0;
@@ -4321,7 +4727,12 @@ boolean PlaceBomb(struct PlayerInfo *player)
     DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3),
 	     FS_SMALL, FC_YELLOW);
     if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
-      DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);
+    {
+      if (game_emulation == EMU_SUPAPLEX)
+	DrawGraphic(SCREENX(jx), SCREENY(jy), GFX_SP_DISK_RED);
+      else
+	DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);
+    }
   }
   else
   {