X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=ec95ff6dcf71d38bed26507ac7ee088a04a5e998;hb=95d786b6fe8474c30a22f839751e0d04c7682ded;hp=a48ad78bad3944432795406b1fae03677445dbe4;hpb=3dc317d10b44cc6b75db10ac194966ad8114d390;p=rocksndiamonds.git

diff --git a/src/game.c b/src/game.c
index a48ad78b..ec95ff6d 100644
--- a/src/game.c
+++ b/src/game.c
@@ -23,13 +23,95 @@
 #include "joystick.h"
 #include "network.h"
 
+/* for DigField() */
+#define DF_NO_PUSH		0
+#define DF_DIG			1
+#define DF_SNAP			2
+
+/* for MoveFigure() */
+#define MF_NO_ACTION		0
+#define MF_MOVING		1
+#define MF_ACTION		2
+
+/* for ScrollFigure() */
+#define SCROLL_INIT		0
+#define SCROLL_GO_ON		1
+
+/* for Explode() */
+#define EX_PHASE_START		0
+#define EX_NORMAL		0
+#define EX_CENTER		1
+#define EX_BORDER		2
+
+/* special positions in the game control window (relative to control window) */
+#define XX_LEVEL		37
+#define YY_LEVEL		20
+#define XX_EMERALDS		29
+#define YY_EMERALDS		54
+#define XX_DYNAMITE		29
+#define YY_DYNAMITE		89
+#define XX_KEYS			18
+#define YY_KEYS			123
+#define XX_SCORE		15
+#define YY_SCORE		159
+#define XX_TIME			29
+#define YY_TIME			194
+
+/* special positions in the game control window (relative to main window) */
+#define DX_LEVEL		(DX + XX_LEVEL)
+#define DY_LEVEL		(DY + YY_LEVEL)
+#define DX_EMERALDS		(DX + XX_EMERALDS)
+#define DY_EMERALDS		(DY + YY_EMERALDS)
+#define DX_DYNAMITE		(DX + XX_DYNAMITE)
+#define DY_DYNAMITE		(DY + YY_DYNAMITE)
+#define DX_KEYS			(DX + XX_KEYS)
+#define DY_KEYS			(DY + YY_KEYS)
+#define DX_SCORE		(DX + XX_SCORE)
+#define DY_SCORE		(DY + YY_SCORE)
+#define DX_TIME			(DX + XX_TIME)
+#define DY_TIME			(DY + YY_TIME)
+
+#define IS_LOOP_SOUND(s)	((s)==SND_KLAPPER || (s)==SND_ROEHR ||	\
+				 (s)==SND_NJAM || (s)==SND_MIEP)
+#define IS_MUSIC_SOUND(s)	((s)==SND_ALCHEMY || (s)==SND_CHASE || \
+				 (s)==SND_NETWORK || (s)==SND_CZARDASZ || \
+				 (s)==SND_TYGER || (s)==SND_VOYAGER || \
+				 (s)==SND_TWILIGHT)
+
+/* score for elements */
+#define SC_EDELSTEIN		0
+#define SC_DIAMANT		1
+#define SC_KAEFER		2
+#define SC_FLIEGER		3
+#define SC_MAMPFER		4
+#define SC_ROBOT		5
+#define SC_PACMAN		6
+#define SC_KOKOSNUSS		7
+#define SC_DYNAMIT		8
+#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;
+
+
+
+
 #ifdef DEBUG
+#if 0
 static unsigned int getStateCheckSum(int counter)
 {
   int x, y;
   unsigned int mult = 1;
   unsigned int checksum = 0;
+  /*
   static short lastFeld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+  */
   static boolean first_game = TRUE;
 
   for (y=0; y<lev_fieldy; y++) for(x=0; x<lev_fieldx; x++)
@@ -68,6 +150,10 @@ static unsigned int getStateCheckSum(int counter)
   return checksum;
 }
 #endif
+#endif
+
+
+
 
 void GetPlayerConfig()
 {
@@ -85,6 +171,138 @@ void GetPlayerConfig()
   InitJoysticks();
 }
 
+static void InitField(int x, int y, boolean init_game)
+{
+  switch (Feld[x][y])
+  {
+    case EL_SPIELFIGUR:
+      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:
+      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;
+  }
+}
+
 void InitGame()
 {
   int i, j, x, y;
@@ -154,9 +372,11 @@ void InitGame()
 
   network_player_action_received = FALSE;
 
+#ifndef MSDOS
   /* initial null action */
   if (network_playing)
     SendToServer_MovePlayer(MV_NO_MOVING);
+#endif
 
   ZX = ZY = -1;
 
@@ -195,120 +415,7 @@ void InitGame()
     if (emulate_sb && !IS_SB_ELEMENT(Feld[x][y]))
       emulate_sb = FALSE;
 
-    switch (Feld[x][y])
-    {
-      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];
-
-	  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;
-    }
+    InitField(x, y, TRUE);
   }
 
   /* check if any connected player was not found in playfield */
@@ -340,20 +447,38 @@ void InitGame()
     }
   }
 
-  /* when in single player mode, eliminate all but the first active player */
-  if (!options.network && !setup.team_mode)
+  if (tape.playing)
   {
+    /* when playing a tape, eliminate all players who do not participate */
+
+    for (i=0; i<MAX_PLAYERS; i++)
+    {
+      if (stored_player[i].active && !tape.player_participates[i])
+      {
+	struct PlayerInfo *player = &stored_player[i];
+	int jx = player->jx, jy = player->jy;
+
+	player->active = FALSE;
+	StorePlayer[jx][jy] = 0;
+	Feld[jx][jy] = EL_LEERRAUM;
+      }
+    }
+  }
+  else if (!options.network && !setup.team_mode)	/* && !tape.playing */
+  {
+    /* when in single player mode, eliminate all but the first active player */
+
     for (i=0; i<MAX_PLAYERS; i++)
     {
       if (stored_player[i].active)
       {
 	for (j=i+1; j<MAX_PLAYERS; j++)
 	{
-	  struct PlayerInfo *player = &stored_player[j];
-	  int jx = player->jx, jy = player->jy;
-
-	  if (player->active)
+	  if (stored_player[j].active)
 	  {
+	    struct PlayerInfo *player = &stored_player[j];
+	    int jx = player->jx, jy = player->jy;
+
 	    player->active = FALSE;
 	    StorePlayer[jx][jy] = 0;
 	    Feld[jx][jy] = EL_LEERRAUM;
@@ -363,19 +488,29 @@ void InitGame()
     }
   }
 
-  for (i=0; i<MAX_PLAYERS; i++)
+  /* when recording the game, store which players take part in the game */
+  if (tape.recording)
   {
-    struct PlayerInfo *player = &stored_player[i];
-
-    printf("Player %d: present == %d, connected == %d, active == %d.\n",
-	   i+1,
-	   player->present,
-	   player->connected,
-	   player->active);
-    if (local_player == player)
-      printf("Player %d is local player.\n", i+1);
+    for (i=0; i<MAX_PLAYERS; i++)
+      if (stored_player[i].active)
+	tape.player_participates[i] = TRUE;
   }
 
+  if (options.verbose)
+  {
+    for (i=0; i<MAX_PLAYERS; i++)
+    {
+      struct PlayerInfo *player = &stored_player[i];
+
+      printf("Player %d: present == %d, connected == %d, active == %d.\n",
+	     i+1,
+	     player->present,
+	     player->connected,
+	     player->active);
+      if (local_player == player)
+	printf("Player 	%d is local player.\n", i+1);
+    }
+  }
 
   game_emulation = (emulate_bd ? EMU_BOULDERDASH :
 		    emulate_sb ? EMU_SOKOBAN : EMU_NONE);
@@ -434,11 +569,12 @@ void InitGame()
 
   XAutoRepeatOff(display);
 
-
-  for (i=0; i<4; i++)
-    printf("Spieler %d %saktiv.\n",
-	   i+1, (stored_player[i].active ? "" : "nicht "));
-
+  if (options.verbose)
+  {
+    for (i=0; i<4; i++)
+      printf("Spieler %d %saktiv.\n",
+	     i+1, (stored_player[i].active ? "" : "nicht "));
+  }
 }
 
 void InitMovDir(int x, int y)
@@ -623,15 +759,15 @@ boolean NewHiScore()
 
   LoadScore(level_nr);
 
-  if (!strcmp(setup.player_name, EMPTY_ALIAS) ||
-      local_player->score < highscore[MAX_SCORE_ENTRIES-1].Score) 
+  if (strcmp(setup.player_name, EMPTY_PLAYER_NAME) == 0 ||
+      local_player->score < highscore[MAX_SCORE_ENTRIES - 1].Score) 
     return -1;
 
   for (k=0; k<MAX_SCORE_ENTRIES; k++) 
   {
     if (local_player->score > highscore[k].Score)
     {
-      /* Spieler kommt in Highscore-Liste */
+      /* player has made it to the hall of fame */
 
       if (k < MAX_SCORE_ENTRIES - 1)
       {
@@ -641,7 +777,7 @@ boolean NewHiScore()
 	for (l=k; l<MAX_SCORE_ENTRIES; l++)
 	  if (!strcmp(setup.player_name, highscore[l].Name))
 	    m = l;
-	if (m == k)	/* Spieler überschreibt seine alte Position */
+	if (m == k)	/* player's new highscore overwrites his old one */
 	  goto put_into_list;
 #endif
 
@@ -664,7 +800,7 @@ boolean NewHiScore()
 
 #ifdef ONE_PER_NAME
     else if (!strncmp(setup.player_name, highscore[k].Name, MAX_NAMELEN - 1))
-      break;	/* Spieler schon mit besserer Punktzahl in der Liste */
+      break;	/* player already there with a higher score */
 #endif
 
   }
@@ -808,7 +944,7 @@ void DrawDynamite(int x, int y)
 
 void CheckDynamite(int x, int y)
 {
-  if (MovDelay[x][y])		/* neues Dynamit / in Wartezustand */
+  if (MovDelay[x][y])		/* dynamite is still waiting to explode */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y])
@@ -836,7 +972,7 @@ void Explode(int ex, int ey, int phase, int mode)
   int last_phase = num_phase * delay;
   int half_phase = (num_phase / 2) * delay;
 
-  if (phase == 0)			/* Feld 'Store' initialisieren */
+  if (phase == EX_PHASE_START)		/* initialize 'Store[][]' field */
   {
     int center_element = Feld[ex][ey];
 
@@ -933,7 +1069,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;
   }
@@ -969,6 +1105,7 @@ 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);
@@ -996,7 +1133,7 @@ void DynaExplode(int ex, int ey)
 
   Store2[ex][ey] = 0;	/* delete player information */
 
-  Explode(ex, ey, 0, EX_CENTER);
+  Explode(ex, ey, EX_PHASE_START, EX_CENTER);
 
   for (i=0; i<4; i++)
   {
@@ -1010,7 +1147,7 @@ void DynaExplode(int ex, int ey)
 	break;
 
       element = Feld[x][y];
-      Explode(x, y, 0, EX_BORDER);
+      Explode(x, y, EX_PHASE_START, EX_BORDER);
 
       if (element != EL_LEERRAUM &&
 	  element != EL_ERDREICH &&
@@ -1029,6 +1166,9 @@ void Bang(int x, int y)
 
   PlaySoundLevel(x, y, SND_ROAAAR);
 
+  if (IS_PLAYER(x, y))	/* remove objects that might cause smaller explosion */
+    element = EL_LEERRAUM;
+
   switch(element)
   {
     case EL_KAEFER:
@@ -1040,7 +1180,7 @@ void Bang(int x, int y)
     case EL_ROBOT:
     case EL_PACMAN:
       RaiseScoreElement(element);
-      Explode(x, y, 0, EX_NORMAL);
+      Explode(x, y, EX_PHASE_START, EX_NORMAL);
       break;
     case EL_DYNABOMB:
     case EL_DYNABOMB_NR:
@@ -1048,12 +1188,14 @@ void Bang(int x, int y)
     case EL_DYNABOMB_XL:
       DynaExplode(x, y);
       break;
+    case EL_MAULWURF:
+    case EL_PINGUIN:
     case EL_BIRNE_AUS:
     case EL_BIRNE_EIN:
-      Explode(x, y, 0, EX_CENTER);
+      Explode(x, y, EX_PHASE_START, EX_CENTER);
       break;
     default:
-      Explode(x, y, 0, EX_NORMAL);
+      Explode(x, y, EX_PHASE_START, EX_NORMAL);
       break;
   }
 }
@@ -1062,7 +1204,7 @@ void Blurb(int x, int y)
 {
   int element = Feld[x][y];
 
-  if (element!=EL_BLURB_LEFT && element!=EL_BLURB_RIGHT) /* Anfang */
+  if (element != EL_BLURB_LEFT && element != EL_BLURB_RIGHT)	/* start */
   {
     PlaySoundLevel(x, y, SND_BLURB);
     if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) &&
@@ -1078,14 +1220,14 @@ void Blurb(int x, int y)
       Feld[x+1][y] = EL_BLURB_RIGHT;
     }
   }
-  else							 /* Blubbern */
+  else								/* go on */
   {
     int graphic = (element==EL_BLURB_LEFT ? GFX_BLURB_LEFT : GFX_BLURB_RIGHT);
 
-    if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
+    if (!MovDelay[x][y])	/* initialize animation counter */
       MovDelay[x][y] = 9;
 
-    if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+    if (MovDelay[x][y])		/* continue animation */
     {
       MovDelay[x][y]--;
       if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
@@ -1107,8 +1249,7 @@ void Impact(int x, int y)
   int element = Feld[x][y];
   int smashed = 0;
 
-  /* Element darunter berührt? */
-  if (!lastline)
+  if (!lastline)	/* check if element below was hit */
   {
     if (Feld[x][y+1] == EL_PLAYER_IS_LEAVING)
       return;
@@ -1120,22 +1261,19 @@ void Impact(int x, int y)
       smashed = MovingOrBlocked2Element(x, y+1);
   }
 
-  /* Auftreffendes Element fällt in Salzsäure */
-  if (!lastline && smashed == EL_SALZSAEURE)
+  if (!lastline && smashed == EL_SALZSAEURE)	/* element falls into acid */
   {
     Blurb(x, y);
     return;
   }
 
-  /* Auftreffendes Element ist Bombe */
-  if (element == EL_BOMBE && (lastline || object_hit))
+  if (element == EL_BOMBE && (lastline || object_hit))	/* element is bomb */
   {
     Bang(x, y);
     return;
   }
 
-  /* Auftreffendes Element ist Säuretropfen */
-  if (element == EL_TROPFEN && (lastline || object_hit))
+  if (element == EL_TROPFEN && (lastline || object_hit))	/* acid drop */
   {
     if (object_hit && IS_PLAYER(x, y+1))
       KillHero(PLAYERINFO(x, y+1));
@@ -1149,8 +1287,7 @@ void Impact(int x, int y)
     return;
   }
 
-  /* Welches Element kriegt was auf die Rübe? */
-  if (!lastline && object_hit)
+  if (!lastline && object_hit)		/* check which object was hit */
   {
     if (CAN_CHANGE(element) && 
 	(smashed == EL_SIEB_LEER || smashed == EL_SIEB2_LEER) && !SiebAktiv)
@@ -1206,7 +1343,7 @@ void Impact(int x, int y)
     }
   }
 
-  /* Geräusch beim Durchqueren des Siebes */
+  /* play sound of magic wall / mill */
   if (!lastline &&
       (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER))
   {
@@ -1214,7 +1351,7 @@ void Impact(int x, int y)
     return;
   }
 
-  /* Geräusch beim Auftreffen */
+  /* play sound of object that hits the ground */
   if (lastline || object_hit)
   {
     int sound;
@@ -1797,11 +1934,10 @@ void StartMoving(int x, int y)
     if (element == EL_SONDE && JustBeingPushed(x, y))
       return;
 
-    if (!MovDelay[x][y])	/* neuer Schritt / noch nicht gewartet */
+    if (!MovDelay[x][y])	/* start new movement phase */
     {
-      /* Alle Figuren, die nach jeden Schritt die Richtung wechseln können.
-       * (MAMPFER, MAMPFER2 und PACMAN laufen bis zur nächsten Wand.)
-       */
+      /* all objects that can change their move direction after each step */
+      /* (MAMPFER, MAMPFER2 and PACMAN go straight until they hit a wall  */
 
       if (element!=EL_MAMPFER && element!=EL_MAMPFER2 && element!=EL_PACMAN)
       {
@@ -1811,7 +1947,7 @@ void StartMoving(int x, int y)
       }
     }
 
-    if (MovDelay[x][y])		/* neuer Schritt / in Wartezustand */
+    if (MovDelay[x][y])		/* wait some time before next movement */
     {
       MovDelay[x][y]--;
 
@@ -1886,13 +2022,13 @@ void StartMoving(int x, int y)
       PlaySoundLevel(x, y, SND_ROEHR);
     }
 
-    /* neuer Schritt / Wartezustand beendet */
+    /* now make next step */
 
-    Moving2Blocked(x, y, &newx, &newy);	/* wohin soll's gehen? */
+    Moving2Blocked(x, y, &newx, &newy);	/* get next screen position */
 
     if (IS_ENEMY(element) && IS_PLAYER(newx, newy))
     {
-      /* Spieler erwischt */
+      /* enemy got the player */
       MovDir[x][y] = 0;
       KillHero(PLAYERINFO(newx, newy));
       return;
@@ -2046,7 +2182,9 @@ void StartMoving(int x, int y)
       DrawLevelField(newx, newy);
     }
     else if (!IN_LEV_FIELD(newx, newy) || !IS_FREE(newx, newy))
-    {					/* gegen Wand gelaufen */
+    {
+      /* object was running against a wall */
+
       TurnRound(x, y);
 
       if (element == EL_KAEFER || element == EL_FLIEGER)
@@ -2088,7 +2226,7 @@ void ContinueMoving(int x, int y)
 
   MovPos[x][y] += step;
 
-  if (ABS(MovPos[x][y])>=TILEX)		/* Zielfeld erreicht */
+  if (ABS(MovPos[x][y])>=TILEX)		/* object reached its destination */
   {
     Feld[x][y] = EL_LEERRAUM;
     Feld[newx][newy] = element;
@@ -2148,7 +2286,7 @@ void ContinueMoving(int x, int y)
     Stop[newx][newy] = TRUE;
     JustHit[x][newy] = 3;
 
-    if (DONT_TOUCH(element))	/* Käfer oder Flieger */
+    if (DONT_TOUCH(element))	/* object may be nasty to player or others */
     {
       TestIfBadThingHitsHero(newx, newy);
       TestIfBadThingHitsFriend(newx, newy);
@@ -2161,7 +2299,7 @@ void ContinueMoving(int x, int y)
 	(newy == lev_fieldy-1 || !IS_FREE(x, newy+1)))
       Impact(x, newy);
   }
-  else				/* noch in Bewegung */
+  else				/* still moving on */
     DrawLevelField(x, y);
 }
 
@@ -2180,13 +2318,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];
   }
 
@@ -2205,13 +2343,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;
@@ -2223,14 +2361,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;
+	}
+      }
     }
   }
 }
@@ -2238,33 +2384,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)
     {
-      if (Feld[x][y] == EL_AMOEBE_TOT && AmoebaNr[x][y] == group_nr)
+      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++)
+    {
+      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;
@@ -2275,23 +2435,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;
+      }
     }
   }
 
@@ -2302,10 +2475,10 @@ void AmoebeUmwandeln2(int ax, int ay, int new_element)
 
 void AmoebeWaechst(int x, int y)
 {
-  static long sound_delay = 0;
-  static int sound_delay_value = 0;
+  static unsigned long sound_delay = 0;
+  static unsigned long sound_delay_value = 0;
 
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[x][y])		/* start new growing cycle */
   {
     MovDelay[x][y] = 7;
 
@@ -2316,11 +2489,11 @@ void AmoebeWaechst(int x, int y)
     }
   }
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (MovDelay[x][y])		/* wait some time before growing bigger */
   {
     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])
     {
@@ -2351,21 +2524,21 @@ void AmoebeAbleger(int ax, int ay)
     return;
   }
 
-  if (!MovDelay[ax][ay])	/* neue Amoebe / noch nicht gewartet */
-    MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25/(1+level.tempo_amoebe));
+  if (!MovDelay[ax][ay])	/* start making new amoeba field */
+    MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.tempo_amoebe));
 
-  if (MovDelay[ax][ay])		/* neue Amoebe / in Wartezustand */
+  if (MovDelay[ax][ay])		/* wait some time before making new amoeba */
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
       return;
   }
 
-  if (element == EL_AMOEBE_NASS)	/* tropfende Amöbe */
+  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;
@@ -2380,16 +2553,16 @@ void AmoebeAbleger(int ax, int ay)
     if (newax == ax && neway == ay)
       return;
   }
-  else				/* normale oder "gefüllte" Amöbe */
+  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;
@@ -2405,7 +2578,7 @@ 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)
       {
@@ -2413,35 +2586,48 @@ void AmoebeAbleger(int ax, int ay)
 	DrawLevelField(ax, ay);
 	AmoebaCnt[AmoebaNr[ax][ay]]--;
 
-	if (AmoebaCnt[AmoebaNr[ax][ay]]<=0)	/* Amöbe vollständig tot */
+	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;
@@ -2463,17 +2649,17 @@ void AmoebeAbleger(int ax, int ay)
 void Life(int ax, int ay)
 {
   int x1, y1, x2, y2;
-  static int life[4] = { 2, 3, 3, 3 };	/* "Life"-Parameter */
+  static int life[4] = { 2, 3, 3, 3 };	/* parameters for "game of life" */
   int life_time = 40;
   int element = Feld[ax][ay];
 
   if (Stop[ax][ay])
     return;
 
-  if (!MovDelay[ax][ay])	/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[ax][ay])	/* start new "game of life" cycle */
     MovDelay[ax][ay] = life_time;
 
-  if (MovDelay[ax][ay])		/* neue Phase / in Wartezustand */
+  if (MovDelay[ax][ay])		/* wait some time before next cycle */
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
@@ -2502,7 +2688,7 @@ void Life(int ax, int ay)
 	nachbarn++;
     }
 
-    if (xx == ax && yy == ay)		/* mittleres Feld mit Amoebe */
+    if (xx == ax && yy == ay)		/* field in the middle */
     {
       if (nachbarn<life[0] || nachbarn>life[1])
       {
@@ -2513,7 +2699,7 @@ void Life(int ax, int ay)
       }
     }
     else if (IS_FREE(xx, yy) || Feld[xx][yy] == EL_ERDREICH)
-    {					/* Randfeld ohne Amoebe */
+    {					/* free border field */
       if (nachbarn>=life[2] && nachbarn<=life[3])
       {
 	Feld[xx][yy] = element;
@@ -2528,10 +2714,10 @@ void Life(int ax, int ay)
 
 void Ablenk(int x, int y)
 {
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[x][y])		/* next animation frame */
     MovDelay[x][y] = level.dauer_ablenk * FRAMES_PER_SECOND;
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (MovDelay[x][y])		/* wait some time before next frame */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y])
@@ -2552,10 +2738,10 @@ void Ablenk(int x, int y)
 
 void Birne(int x, int y)
 {
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[x][y])		/* next animation frame */
     MovDelay[x][y] = 800;
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (MovDelay[x][y])		/* wait some time before next frame */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y])
@@ -2589,10 +2775,10 @@ void Blubber(int x, int y)
 
 void NussKnacken(int x, int y)
 {
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[x][y])		/* next animation frame */
     MovDelay[x][y] = 7;
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (MovDelay[x][y])		/* wait some time before next frame */
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
@@ -2634,10 +2820,10 @@ void AusgangstuerOeffnen(int x, int y)
 {
   int delay = 6;
 
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[x][y])		/* next animation frame */
     MovDelay[x][y] = 5*delay;
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (MovDelay[x][y])		/* wait some time before next frame */
   {
     int tuer;
 
@@ -2668,10 +2854,10 @@ void EdelsteinFunkeln(int x, int y)
     DrawGraphicAnimation(x, y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE);
   else
   {
-    if (!MovDelay[x][y])	/* neue Phase / noch nicht gewartet */
+    if (!MovDelay[x][y])	/* next animation frame */
       MovDelay[x][y] = 11 * !SimpleRND(500);
 
-    if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+    if (MovDelay[x][y])		/* wait some time before next frame */
     {
       MovDelay[x][y]--;
 
@@ -2709,10 +2895,10 @@ void MauerWaechst(int x, int y)
 {
   int delay = 6;
 
-  if (!MovDelay[x][y])		/* neue Phase / noch nicht gewartet */
+  if (!MovDelay[x][y])		/* next animation frame */
     MovDelay[x][y] = 3*delay;
 
-  if (MovDelay[x][y])		/* neue Phase / in Wartezustand */
+  if (MovDelay[x][y])		/* wait some time before next frame */
   {
     int phase;
 
@@ -2764,10 +2950,10 @@ void MauerAbleger(int ax, int ay)
   boolean oben_massiv = FALSE, unten_massiv = FALSE;
   boolean links_massiv = FALSE, rechts_massiv = FALSE;
 
-  if (!MovDelay[ax][ay])	/* neue Mauer / noch nicht gewartet */
+  if (!MovDelay[ax][ay])	/* start building new wall */
     MovDelay[ax][ay] = 6;
 
-  if (MovDelay[ax][ay])		/* neue Mauer / in Wartezustand */
+  if (MovDelay[ax][ay])		/* wait some time before building new wall */
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
@@ -2992,8 +3178,8 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action)
 
 void GameActions()
 {
-  static long action_delay = 0;
-  long action_delay_value;
+  static unsigned long action_delay = 0;
+  unsigned long action_delay_value;
   int sieb_x = 0, sieb_y = 0;
   int i, x, y, element;
   byte *recorded_player_action;
@@ -3005,8 +3191,40 @@ void GameActions()
   action_delay_value =
     (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
 
+  /*
+  if (tape.playing && tape.fast_forward)
+  {
+    char buf[100];
+
+    sprintf(buf, "FFWD: %ld ms", action_delay_value);
+    print_debug(buf);
+  }
+  */
+
+
   /* main game synchronization point */
+
+
+
+
+#if 1
   WaitUntilDelayReached(&action_delay, action_delay_value);
+#else
+
+  while (!DelayReached(&action_delay, action_delay_value))
+  {
+    char buf[100];
+
+    sprintf(buf, "%ld %ld %ld",
+	    Counter(), action_delay, action_delay_value);
+    print_debug(buf);
+  }
+  print_debug("done");
+
+#endif
+
+
+
 
   if (network_playing && !network_player_action_received)
   {
@@ -3016,8 +3234,10 @@ void GameActions()
 #endif
     */
 
+#ifndef MSDOS
     /* last chance to get network player actions without main loop delay */
     HandleNetworking();
+#endif
 
     if (game_status != PLAYING)
       return;
@@ -3059,8 +3279,10 @@ void GameActions()
       stored_player[i].effective_action = stored_player[i].action;
   }
 
+#ifndef MSDOS
   if (network_playing)
     SendToServer_MovePlayer(summarized_player_action);
+#endif
 
   if (!options.network && !setup.team_mode)
     local_player->effective_action = summarized_player_action;
@@ -3093,6 +3315,7 @@ void GameActions()
 
 
 #ifdef DEBUG
+  /*
   if (TimeFrames == 0 && !local_player->gone)
   {
     extern unsigned int last_RND();
@@ -3102,13 +3325,16 @@ void GameActions()
 	   last_RND(),
 	   getStateCheckSum(level.time - TimeLeft));
   }
+  */
 #endif
 
 
 
 #ifdef DEBUG
+  /*
   if (GameFrameDelay >= 500)
     printf("FrameCounter == %d\n", FrameCounter);
+  */
 #endif
 
 
@@ -3405,11 +3631,11 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
 
   if (player->MovPos)
   {
-    /* should only happen if pre-1.0 tape recordings are played */
+    /* should only happen if pre-1.2 tape recordings are played */
     /* this is only for backward compatibility */
 
 #if DEBUG
-    printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.0 LEVEL TAPES.\n");
+    printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES.\n");
 #endif
 
     while (player->MovPos)
@@ -3517,7 +3743,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
     else if (old_jx == jx && old_jy != jy)
       player->MovDir = (old_jy < jy ? MV_DOWN : MV_UP);
 
-    DrawLevelField(jx, jy);	/* für "ErdreichAnbroeckeln()" */
+    DrawLevelField(jx, jy);	/* for "ErdreichAnbroeckeln()" */
 
     player->last_move_dir = player->MovDir;
   }
@@ -3579,7 +3805,7 @@ void ScrollFigure(struct PlayerInfo *player, int mode)
 
 void ScrollScreen(struct PlayerInfo *player, int mode)
 {
-  static long screen_frame_counter = 0;
+  static unsigned long screen_frame_counter = 0;
 
   if (mode == SCROLL_INIT)
   {
@@ -3843,6 +4069,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)
@@ -3970,7 +4197,7 @@ int DigField(struct PlayerInfo *player,
 
     case EL_AUSGANG_ZU:
     case EL_AUSGANG_ACT:
-      /* Tür ist (noch) nicht offen! */
+      /* door is not (yet) open */
       return MF_NO_ACTION;
       break;
 
@@ -4090,7 +4317,11 @@ int DigField(struct PlayerInfo *player,
       break;
 
     default:
-      return MF_NO_ACTION;
+      if (IS_EATABLE(element))		/* other kinds of 'dirt' */
+	Feld[x][y] = EL_LEERRAUM;
+      else
+	return MF_NO_ACTION;
+
       break;
   }