added creating engine snapshots when using mouse click events
[rocksndiamonds.git] / src / game.c
index b80d8585b9fc63889a907efb28bc5163715ea823..8b77ddef674f65d232e0c968c5e4c5ef9529870f 100644 (file)
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //                         Holger Schemel
 //                 info@artsoft.org
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // game.c
 // ============================================================================
 #include "anim.h"
 
 
-/* DEBUG SETTINGS */
+// DEBUG SETTINGS
 #define DEBUG_INIT_PLAYER      1
 #define DEBUG_PLAYER_ACTIONS   0
 
-/* EXPERIMENTAL STUFF */
+// EXPERIMENTAL STUFF
 #define USE_NEW_AMOEBA_CODE    FALSE
 
-/* EXPERIMENTAL STUFF */
+// EXPERIMENTAL STUFF
 #define USE_QUICKSAND_BD_ROCK_BUGFIX   0
 #define USE_QUICKSAND_IMPACT_BUGFIX    0
 #define USE_DELAYED_GFX_REDRAW         0
 #endif
 
 
-/* for DigField() */
+// for DigField()
 #define DF_NO_PUSH             0
 #define DF_DIG                 1
 #define DF_SNAP                        2
 
-/* for MovePlayer() */
+// for MovePlayer()
 #define MP_NO_ACTION           0
 #define MP_MOVING              1
 #define MP_ACTION              2
 #define MP_DONT_RUN_INTO       (MP_MOVING | MP_ACTION)
 
-/* for ScrollPlayer() */
+// for ScrollPlayer()
 #define SCROLL_INIT            0
 #define SCROLL_GO_ON           1
 
-/* for Bang()/Explode() */
+// for Bang()/Explode()
 #define EX_PHASE_START         0
 #define EX_TYPE_NONE           0
 #define EX_TYPE_NORMAL         (1 << 0)
@@ -86,7 +86,7 @@
 #define PANEL_XPOS(p)          (DX + ALIGNED_TEXT_XPOS(p))
 #define PANEL_YPOS(p)          (DY + ALIGNED_TEXT_YPOS(p))
 
-/* game panel display and control definitions */
+// game panel display and control definitions
 #define GAME_PANEL_LEVEL_NUMBER                        0
 #define GAME_PANEL_GEMS                                1
 #define GAME_PANEL_INVENTORY_COUNT             2
@@ -831,17 +831,17 @@ static struct GamePanelControlInfo game_panel_controls[] =
   }
 };
 
-/* values for delayed check of falling and moving elements and for collision */
+// values for delayed check of falling and moving elements and for collision
 #define CHECK_DELAY_MOVING     3
 #define CHECK_DELAY_FALLING    CHECK_DELAY_MOVING
 #define CHECK_DELAY_COLLISION  2
 #define CHECK_DELAY_IMPACT     CHECK_DELAY_COLLISION
 
-/* values for initial player move delay (initial delay counter value) */
+// values for initial player move delay (initial delay counter value)
 #define INITIAL_MOVE_DELAY_OFF -1
 #define INITIAL_MOVE_DELAY_ON  0
 
-/* values for player movement speed (which is in fact a delay value) */
+// values for player movement speed (which is in fact a delay value)
 #define MOVE_DELAY_MIN_SPEED   32
 #define MOVE_DELAY_NORMAL_SPEED        8
 #define MOVE_DELAY_HIGH_SPEED  4
@@ -853,7 +853,7 @@ static struct GamePanelControlInfo game_panel_controls[] =
 #define DOUBLE_PLAYER_SPEED(p) (HALVE_MOVE_DELAY( (p)->move_delay_value))
 #define HALVE_PLAYER_SPEED(p)  (DOUBLE_MOVE_DELAY((p)->move_delay_value))
 
-/* values for scroll positions */
+// values for scroll positions
 #define SCROLL_POSITION_X(x)   ((x) < SBX_Left  + MIDPOSX ? SBX_Left : \
                                 (x) > SBX_Right + MIDPOSX ? SBX_Right :\
                                 (x) - MIDPOSX)
@@ -861,7 +861,7 @@ static struct GamePanelControlInfo game_panel_controls[] =
                                 (y) > SBY_Lower + MIDPOSY ? SBY_Lower :\
                                 (y) - MIDPOSY)
 
-/* values for other actions */
+// values for other actions
 #define MOVE_STEPSIZE_NORMAL   (TILEX / MOVE_DELAY_NORMAL_SPEED)
 #define MOVE_STEPSIZE_MIN      (1)
 #define MOVE_STEPSIZE_MAX      (TILEX)
@@ -920,20 +920,20 @@ static struct GamePanelControlInfo game_panel_controls[] =
 #define ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, condition)             \
                (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) ||                \
                                        (CAN_MOVE_INTO_ACID(e) &&       \
-                                        Feld[x][y] == EL_ACID) ||      \
+                                        Tile[x][y] == EL_ACID) ||      \
                                        (condition)))
 
 #define ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, condition)             \
                (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) ||      \
                                        (CAN_MOVE_INTO_ACID(e) &&       \
-                                        Feld[x][y] == EL_ACID) ||      \
+                                        Tile[x][y] == EL_ACID) ||      \
                                        (condition)))
 
 #define ELEMENT_CAN_ENTER_FIELD_BASE_4(e, x, y, condition)             \
                (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) ||                \
                                        (condition) ||                  \
                                        (CAN_MOVE_INTO_ACID(e) &&       \
-                                        Feld[x][y] == EL_ACID) ||      \
+                                        Tile[x][y] == EL_ACID) ||      \
                                        (DONT_COLLIDE_WITH(e) &&        \
                                         IS_PLAYER(x, y) &&             \
                                         !PLAYER_ENEMY_PROTECTED(x, y))))
@@ -945,33 +945,33 @@ static struct GamePanelControlInfo game_panel_controls[] =
        ELEMENT_CAN_ENTER_FIELD_BASE_2(EL_SATELLITE, x, y, 0)
 
 #define ANDROID_CAN_ENTER_FIELD(e, x, y)                               \
-       ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, Feld[x][y] == EL_EMC_PLANT)
+       ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, Tile[x][y] == EL_EMC_PLANT)
 
 #define ANDROID_CAN_CLONE_FIELD(x, y)                                  \
-       (IN_LEV_FIELD(x, y) && (CAN_BE_CLONED_BY_ANDROID(Feld[x][y]) || \
+       (IN_LEV_FIELD(x, y) && (CAN_BE_CLONED_BY_ANDROID(Tile[x][y]) || \
                                CAN_BE_CLONED_BY_ANDROID(EL_TRIGGER_ELEMENT)))
 
 #define ENEMY_CAN_ENTER_FIELD(e, x, y)                                 \
        ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, 0)
 
 #define YAMYAM_CAN_ENTER_FIELD(e, x, y)                                        \
-       ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, Feld[x][y] == EL_DIAMOND)
+       ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, Tile[x][y] == EL_DIAMOND)
 
 #define DARK_YAMYAM_CAN_ENTER_FIELD(e, x, y)                           \
-       ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x,y, IS_FOOD_DARK_YAMYAM(Feld[x][y]))
+       ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x,y, IS_FOOD_DARK_YAMYAM(Tile[x][y]))
 
 #define PACMAN_CAN_ENTER_FIELD(e, x, y)                                        \
-       ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, IS_AMOEBOID(Feld[x][y]))
+       ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, IS_AMOEBOID(Tile[x][y]))
 
 #define PIG_CAN_ENTER_FIELD(e, x, y)                                   \
-       ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, IS_FOOD_PIG(Feld[x][y]))
+       ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, IS_FOOD_PIG(Tile[x][y]))
 
 #define PENGUIN_CAN_ENTER_FIELD(e, x, y)                               \
-       ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, (Feld[x][y] == EL_EXIT_OPEN || \
-                                                Feld[x][y] == EL_EM_EXIT_OPEN || \
-                                                Feld[x][y] == EL_STEEL_EXIT_OPEN || \
-                                                Feld[x][y] == EL_EM_STEEL_EXIT_OPEN || \
-                                                IS_FOOD_PENGUIN(Feld[x][y])))
+       ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, (Tile[x][y] == EL_EXIT_OPEN || \
+                                                Tile[x][y] == EL_EM_EXIT_OPEN || \
+                                                Tile[x][y] == EL_STEEL_EXIT_OPEN || \
+                                                Tile[x][y] == EL_EM_STEEL_EXIT_OPEN || \
+                                                IS_FOOD_PENGUIN(Tile[x][y])))
 #define DRAGON_CAN_ENTER_FIELD(e, x, y)                                        \
        ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, 0)
 
@@ -982,14 +982,14 @@ static struct GamePanelControlInfo game_panel_controls[] =
        ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, 0)
 
 #define SPRING_CAN_BUMP_FROM_FIELD(x, y)                               \
-       (IN_LEV_FIELD(x, y) && (Feld[x][y] == EL_EMC_SPRING_BUMPER ||   \
-                               Feld[x][y] == EL_EMC_SPRING_BUMPER_ACTIVE))
+       (IN_LEV_FIELD(x, y) && (Tile[x][y] == EL_EMC_SPRING_BUMPER ||   \
+                               Tile[x][y] == EL_EMC_SPRING_BUMPER_ACTIVE))
 
 #define MOVE_ENTER_EL(e)       (element_info[e].move_enter_element)
 
 #define CE_ENTER_FIELD_COND(e, x, y)                                   \
                (!IS_PLAYER(x, y) &&                                    \
-                IS_EQUAL_OR_IN_GROUP(Feld[x][y], MOVE_ENTER_EL(e)))
+                IS_EQUAL_OR_IN_GROUP(Tile[x][y], MOVE_ENTER_EL(e)))
 
 #define CUSTOM_ELEMENT_CAN_ENTER_FIELD(e, x, y)                                \
        ELEMENT_CAN_ENTER_FIELD_BASE_4(e, x, y, CE_ENTER_FIELD_COND(e, x, y))
@@ -1004,7 +1004,7 @@ static struct GamePanelControlInfo game_panel_controls[] =
 
 #define MM_HEALTH(x)           (MIN(MAX(0, MAX_HEALTH - (x)), MAX_HEALTH))
 
-/* game button identifiers */
+// game button identifiers
 #define GAME_CTRL_ID_STOP              0
 #define GAME_CTRL_ID_PAUSE             1
 #define GAME_CTRL_ID_PLAY              2
@@ -1016,17 +1016,19 @@ static struct GamePanelControlInfo game_panel_controls[] =
 #define GAME_CTRL_ID_PANEL_STOP                8
 #define GAME_CTRL_ID_PANEL_PAUSE       9
 #define GAME_CTRL_ID_PANEL_PLAY                10
-#define SOUND_CTRL_ID_MUSIC            11
-#define SOUND_CTRL_ID_LOOPS            12
-#define SOUND_CTRL_ID_SIMPLE           13
-#define SOUND_CTRL_ID_PANEL_MUSIC      14
-#define SOUND_CTRL_ID_PANEL_LOOPS      15
-#define SOUND_CTRL_ID_PANEL_SIMPLE     16
+#define GAME_CTRL_ID_TOUCH_STOP                11
+#define GAME_CTRL_ID_TOUCH_PAUSE       12
+#define SOUND_CTRL_ID_MUSIC            13
+#define SOUND_CTRL_ID_LOOPS            14
+#define SOUND_CTRL_ID_SIMPLE           15
+#define SOUND_CTRL_ID_PANEL_MUSIC      16
+#define SOUND_CTRL_ID_PANEL_LOOPS      17
+#define SOUND_CTRL_ID_PANEL_SIMPLE     18
 
-#define NUM_GAME_BUTTONS               17
+#define NUM_GAME_BUTTONS               19
 
 
-/* forward declaration for internal use */
+// forward declaration for internal use
 
 static void CreateField(int, int, int);
 
@@ -1090,8 +1092,8 @@ static void FadeLevelSoundsAndMusic(void);
 
 static void HandleGameButtons(struct GadgetInfo *);
 
-int AmoebeNachbarNr(int, int);
-void AmoebeUmwandeln(int, int);
+int AmoebaNeighbourNr(int, int);
+void AmoebaToDiamond(int, int);
 void ContinueMoving(int, int);
 void Bang(int, int);
 void InitMovDir(int, int);
@@ -1119,8 +1121,8 @@ static int getInvisibleFromInvisibleActiveElement(int);
 
 static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS];
 
-/* for detection of endless loops, caused by custom element programming */
-/* (using maximal playfield width x 10 is just a rough approximation) */
+// for detection of endless loops, caused by custom element programming
+// (using maximal playfield width x 10 is just a rough approximation)
 #define MAX_ELEMENT_CHANGE_RECURSION_DEPTH     (MAX_PLAYFIELD_WIDTH * 10)
 
 #define RECURSION_LOOP_DETECTION_START(e, rc)                          \
@@ -1149,12 +1151,12 @@ static boolean recursion_loop_element;
 static int map_player_action[MAX_PLAYERS];
 
 
-/* ------------------------------------------------------------------------- */
-/* definition of elements that automatically change to other elements after  */
-/* a specified time, eventually calling a function when changing             */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// definition of elements that automatically change to other elements after
+// a specified time, eventually calling a function when changing
+// ----------------------------------------------------------------------------
 
-/* forward declaration for changer functions */
+// forward declaration for changer functions
 static void InitBuggyBase(int, int);
 static void WarnBuggyBase(int, int);
 
@@ -1543,12 +1545,12 @@ static boolean trigger_events[MAX_NUM_ELEMENTS][NUM_CHANGE_EVENTS];
 
 #define IS_AUTO_CHANGING(e)    (element_info[e].has_change_event[CE_DELAY])
 #define IS_JUST_CHANGING(x, y) (ChangeDelay[x][y] != 0)
-#define IS_CHANGING(x, y)      (IS_AUTO_CHANGING(Feld[x][y]) || \
+#define IS_CHANGING(x, y)      (IS_AUTO_CHANGING(Tile[x][y]) || \
                                 IS_JUST_CHANGING(x, y))
 
 #define CE_PAGE(e, ce)         (element_info[e].event_page[ce])
 
-/* static variables for playfield scan mode (scanning forward or backward) */
+// static variables for playfield scan mode (scanning forward or backward)
 static int playfield_scan_start_x = 0;
 static int playfield_scan_start_y = 0;
 static int playfield_scan_delta_x = 1;
@@ -1606,7 +1608,7 @@ static int get_move_delay_from_stepsize(int move_stepsize)
   move_stepsize =
     MIN(MAX(MOVE_STEPSIZE_MIN, move_stepsize), MOVE_STEPSIZE_MAX);
 
-  /* make sure that stepsize value is always a power of 2 */
+  // make sure that stepsize value is always a power of 2
   move_stepsize = (1 << log_2(move_stepsize));
 
   return TILEX / move_stepsize;
@@ -1619,10 +1621,10 @@ static void SetPlayerMoveSpeed(struct PlayerInfo *player, int move_stepsize,
   int move_delay = get_move_delay_from_stepsize(move_stepsize);
   boolean cannot_move = (move_stepsize == STEPSIZE_NOT_MOVING ? TRUE : FALSE);
 
-  /* do no immediately change move delay -- the player might just be moving */
+  // do no immediately change move delay -- the player might just be moving
   player->move_delay_value_next = move_delay;
 
-  /* information if player can move must be set separately */
+  // information if player can move must be set separately
   player->cannot_move = cannot_move;
 
   if (init_game)
@@ -1683,6 +1685,30 @@ int GetElementFromGroupElement(int element)
   return element;
 }
 
+static void IncrementSokobanFieldsNeeded(void)
+{
+  if (level.sb_fields_needed)
+    game.sokoban_fields_still_needed++;
+}
+
+static void IncrementSokobanObjectsNeeded(void)
+{
+  if (level.sb_objects_needed)
+    game.sokoban_objects_still_needed++;
+}
+
+static void DecrementSokobanFieldsNeeded(void)
+{
+  if (game.sokoban_fields_still_needed > 0)
+    game.sokoban_fields_still_needed--;
+}
+
+static void DecrementSokobanObjectsNeeded(void)
+{
+  if (game.sokoban_objects_still_needed > 0)
+    game.sokoban_objects_still_needed--;
+}
+
 static void InitPlayerField(int x, int y, int element, boolean init_game)
 {
   if (element == EL_SP_MURPHY)
@@ -1691,7 +1717,7 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
     {
       if (stored_player[0].present)
       {
-       Feld[x][y] = EL_SP_MURPHY_CLONE;
+       Tile[x][y] = EL_SP_MURPHY_CLONE;
 
        return;
       }
@@ -1704,13 +1730,13 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
          stored_player[0].artwork_element = EL_SP_MURPHY;
       }
 
-      Feld[x][y] = EL_PLAYER_1;
+      Tile[x][y] = EL_PLAYER_1;
     }
   }
 
   if (init_game)
   {
-    struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_PLAYER_1];
+    struct PlayerInfo *player = &stored_player[Tile[x][y] - EL_PLAYER_1];
     int jx = player->jx, jy = player->jy;
 
     player->present = TRUE;
@@ -1719,16 +1745,16 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
                                level.sp_block_last_field :
                                level.block_last_field);
 
-    /* ---------- initialize player's last field block delay --------------- */
+    // ---------- initialize player's last field block delay ------------------
 
-    /* always start with reliable default value (no adjustment needed) */
+    // always start with reliable default value (no adjustment needed)
     player->block_delay_adjustment = 0;
 
-    /* special case 1: in Supaplex, Murphy blocks last field one more frame */
+    // special case 1: in Supaplex, Murphy blocks last field one more frame
     if (player->block_last_field && element == EL_SP_MURPHY)
       player->block_delay_adjustment = 1;
 
-    /* special case 2: in game engines before 3.1.1, blocking was different */
+    // special case 2: in game engines before 3.1.1, blocking was different
     if (game.use_block_last_field_bug)
       player->block_delay_adjustment = (player->block_last_field ? -1 : 1);
 
@@ -1736,42 +1762,40 @@ static void InitPlayerField(int x, int y, int element, boolean init_game)
     {
       player->active = TRUE;
 
-      /* remove potentially duplicate players */
-      if (StorePlayer[jx][jy] == Feld[x][y])
+      // remove potentially duplicate players
+      if (StorePlayer[jx][jy] == Tile[x][y])
        StorePlayer[jx][jy] = 0;
 
-      StorePlayer[x][y] = Feld[x][y];
+      StorePlayer[x][y] = Tile[x][y];
 
 #if DEBUG_INIT_PLAYER
-      if (options.debug)
-      {
-       printf("- player element %d activated", player->element_nr);
-       printf(" (local player is %d and currently %s)\n",
-              local_player->element_nr,
-              local_player->active ? "active" : "not active");
-      }
+      Debug("game:init:player", "- player element %d activated",
+           player->element_nr);
+      Debug("game:init:player", "  (local player is %d and currently %s)",
+           local_player->element_nr,
+           local_player->active ? "active" : "not active");
     }
 #endif
 
-    Feld[x][y] = EL_EMPTY;
+    Tile[x][y] = EL_EMPTY;
 
     player->jx = player->last_jx = x;
     player->jy = player->last_jy = y;
   }
 
-  if (!init_game)
+  // always check if player was just killed and should be reanimated
   {
     int player_nr = GET_PLAYER_NR(element);
     struct PlayerInfo *player = &stored_player[player_nr];
 
     if (player->active && player->killed)
-      player->reanimated = TRUE; /* if player was just killed, reanimate him */
+      player->reanimated = TRUE; // if player was just killed, reanimate him
   }
 }
 
 static void InitField(int x, int y, boolean init_game)
 {
-  int element = Feld[x][y];
+  int element = Tile[x][y];
 
   switch (element)
   {
@@ -1784,28 +1808,32 @@ static void InitField(int x, int y, boolean init_game)
       break;
 
     case EL_SOKOBAN_FIELD_PLAYER:
-      element = Feld[x][y] = EL_PLAYER_1;
+      element = Tile[x][y] = EL_PLAYER_1;
       InitField(x, y, init_game);
 
-      element = Feld[x][y] = EL_SOKOBAN_FIELD_EMPTY;
+      element = Tile[x][y] = EL_SOKOBAN_FIELD_EMPTY;
       InitField(x, y, init_game);
       break;
 
     case EL_SOKOBAN_FIELD_EMPTY:
-      local_player->sokobanfields_still_needed++;
+      IncrementSokobanFieldsNeeded();
+      break;
+
+    case EL_SOKOBAN_OBJECT:
+      IncrementSokobanObjectsNeeded();
       break;
 
     case EL_STONEBLOCK:
-      if (x < lev_fieldx-1 && Feld[x+1][y] == EL_ACID)
-       Feld[x][y] = EL_ACID_POOL_TOPLEFT;
-      else if (x > 0 && Feld[x-1][y] == EL_ACID)
-       Feld[x][y] = EL_ACID_POOL_TOPRIGHT;
-      else if (y > 0 && Feld[x][y-1] == EL_ACID_POOL_TOPLEFT)
-       Feld[x][y] = EL_ACID_POOL_BOTTOMLEFT;
-      else if (y > 0 && Feld[x][y-1] == EL_ACID)
-       Feld[x][y] = EL_ACID_POOL_BOTTOM;
-      else if (y > 0 && Feld[x][y-1] == EL_ACID_POOL_TOPRIGHT)
-       Feld[x][y] = EL_ACID_POOL_BOTTOMRIGHT;
+      if (x < lev_fieldx-1 && Tile[x+1][y] == EL_ACID)
+       Tile[x][y] = EL_ACID_POOL_TOPLEFT;
+      else if (x > 0 && Tile[x-1][y] == EL_ACID)
+       Tile[x][y] = EL_ACID_POOL_TOPRIGHT;
+      else if (y > 0 && Tile[x][y-1] == EL_ACID_POOL_TOPLEFT)
+       Tile[x][y] = EL_ACID_POOL_BOTTOMLEFT;
+      else if (y > 0 && Tile[x][y-1] == EL_ACID)
+       Tile[x][y] = EL_ACID_POOL_BOTTOM;
+      else if (y > 0 && Tile[x][y-1] == EL_ACID_POOL_TOPRIGHT)
+       Tile[x][y] = EL_ACID_POOL_BOTTOMRIGHT;
       break;
 
     case EL_BUG:
@@ -1847,6 +1875,8 @@ static void InitField(int x, int y, boolean init_game)
     case EL_MOLE_RIGHT:
     case EL_MOLE_UP:
     case EL_MOLE_DOWN:
+    case EL_SPRING_LEFT:
+    case EL_SPRING_RIGHT:
       InitMovDir(x, y);
       break;
 
@@ -1858,7 +1888,7 @@ static void InitField(int x, int y, boolean init_game)
     case EL_AMOEBA_DROP:
       if (y == lev_fieldy - 1)
       {
-       Feld[x][y] = EL_AMOEBA_GROWING;
+       Tile[x][y] = EL_AMOEBA_GROWING;
        Store[x][y] = EL_AMOEBA_WET;
       }
       break;
@@ -1877,11 +1907,11 @@ static void InitField(int x, int y, boolean init_game)
       break;
 
     case EL_LAMP:
-      local_player->lights_still_needed++;
+      game.lights_still_needed++;
       break;
 
     case EL_PENGUIN:
-      local_player->friends_still_needed++;
+      game.friends_still_needed++;
       break;
 
     case EL_PIG:
@@ -1903,18 +1933,18 @@ static void InitField(int x, int y, boolean init_game)
     case EL_CONVEYOR_BELT_4_SWITCH_RIGHT:
       if (init_game)
       {
-       int belt_nr = getBeltNrFromBeltSwitchElement(Feld[x][y]);
-       int belt_dir = getBeltDirFromBeltSwitchElement(Feld[x][y]);
-       int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(Feld[x][y]);
+       int belt_nr = getBeltNrFromBeltSwitchElement(Tile[x][y]);
+       int belt_dir = getBeltDirFromBeltSwitchElement(Tile[x][y]);
+       int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(Tile[x][y]);
 
-       if (game.belt_dir_nr[belt_nr] == 3)     /* initial value */
+       if (game.belt_dir_nr[belt_nr] == 3)     // initial value
        {
          game.belt_dir[belt_nr] = belt_dir;
          game.belt_dir_nr[belt_nr] = belt_dir_nr;
        }
-       else    /* more than one switch -- set it like the first switch */
+       else    // more than one switch -- set it like the first switch
        {
-         Feld[x][y] = Feld[x][y] - belt_dir_nr + game.belt_dir_nr[belt_nr];
+         Tile[x][y] = Tile[x][y] - belt_dir_nr + game.belt_dir_nr[belt_nr];
        }
       }
       break;
@@ -1929,17 +1959,17 @@ static void InitField(int x, int y, boolean init_game)
     case EL_INVISIBLE_SAND:
       if (game.light_time_left > 0 ||
          game.lenses_time_left > 0)
-        Feld[x][y] = getInvisibleActiveFromInvisibleElement(element);
+        Tile[x][y] = getInvisibleActiveFromInvisibleElement(element);
       break;
 
     case EL_EMC_MAGIC_BALL:
-      if (game.ball_state)
-       Feld[x][y] = EL_EMC_MAGIC_BALL_ACTIVE;
+      if (game.ball_active)
+       Tile[x][y] = EL_EMC_MAGIC_BALL_ACTIVE;
       break;
 
     case EL_EMC_MAGIC_BALL_SWITCH:
-      if (game.ball_state)
-       Feld[x][y] = EL_EMC_MAGIC_BALL_SWITCH_ACTIVE;
+      if (game.ball_active)
+       Tile[x][y] = EL_EMC_MAGIC_BALL_SWITCH_ACTIVE;
       break;
 
     case EL_TRIGGER_PLAYER:
@@ -1966,8 +1996,8 @@ static void InitField(int x, int y, boolean init_game)
     case EL_NEXT_CE_6:
     case EL_NEXT_CE_7:
     case EL_NEXT_CE_8:
-      /* reference elements should not be used on the playfield */
-      Feld[x][y] = EL_EMPTY;
+      // reference elements should not be used on the playfield
+      Tile[x][y] = EL_EMPTY;
       break;
 
     default:
@@ -1977,11 +2007,11 @@ static void InitField(int x, int y, boolean init_game)
          InitMovDir(x, y);
 
        if (!element_info[element].use_last_ce_value || init_game)
-         CustomValue[x][y] = GET_NEW_CE_VALUE(Feld[x][y]);
+         CustomValue[x][y] = GET_NEW_CE_VALUE(Tile[x][y]);
       }
       else if (IS_GROUP_ELEMENT(element))
       {
-       Feld[x][y] = GetElementFromGroupElement(element);
+       Tile[x][y] = GetElementFromGroupElement(element);
 
        InitField(x, y, init_game);
       }
@@ -1993,23 +2023,23 @@ static void InitField(int x, int y, boolean init_game)
     CheckTriggeredElementChange(x, y, element, CE_CREATION_OF_X);
 }
 
-inline static void InitField_WithBug1(int x, int y, boolean init_game)
+static void InitField_WithBug1(int x, int y, boolean init_game)
 {
   InitField(x, y, init_game);
 
-  /* not needed to call InitMovDir() -- already done by InitField()! */
+  // not needed to call InitMovDir() -- already done by InitField()!
   if (game.engine_version < VERSION_IDENT(3,1,0,0) &&
-      CAN_MOVE(Feld[x][y]))
+      CAN_MOVE(Tile[x][y]))
     InitMovDir(x, y);
 }
 
-inline static void InitField_WithBug2(int x, int y, boolean init_game)
+static void InitField_WithBug2(int x, int y, boolean init_game)
 {
-  int old_element = Feld[x][y];
+  int old_element = Tile[x][y];
 
   InitField(x, y, init_game);
 
-  /* not needed to call InitMovDir() -- already done by InitField()! */
+  // not needed to call InitMovDir() -- already done by InitField()!
   if (game.engine_version < VERSION_IDENT(3,1,0,0) &&
       CAN_MOVE(old_element) &&
       (old_element < EL_MOLE_LEFT || old_element > EL_MOLE_DOWN))
@@ -2046,8 +2076,8 @@ static int get_next_dropped_element(struct PlayerInfo *player)
 
 static int get_inventory_element_from_pos(struct PlayerInfo *player, int pos)
 {
-  /* pos >= 0: get element from bottom of the stack;
-     pos <  0: get element from top of the stack */
+  // pos >= 0: get element from bottom of the stack;
+  // pos <  0: get element from top of the stack
 
   if (pos < 0)
   {
@@ -2096,9 +2126,9 @@ static int compareGamePanelOrderInfo(const void *object1, const void *object2)
 int getPlayerInventorySize(int player_nr)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return level.native_em_level->ply[player_nr]->dynamite;
+    return game_em.ply[player_nr]->dynamite;
   else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-    return level.native_sp_level->game_sp->red_disk_count;
+    return game_sp.red_disk_count;
   else
     return stored_player[player_nr].inventory_size;
 }
@@ -2117,16 +2147,17 @@ static void InitGameControlValues(void)
 
     if (nr != i)
     {
-      Error(ERR_INFO, "'game_panel_controls' structure corrupted at %d", i);
-      Error(ERR_EXIT, "this should not happen -- please debug");
+      Error("'game_panel_controls' structure corrupted at %d", i);
+
+      Fail("this should not happen -- please debug");
     }
 
-    /* force update of game controls after initialization */
+    // force update of game controls after initialization
     gpc->value = gpc->last_value = -1;
     gpc->frame = gpc->last_frame = -1;
     gpc->gfx_frame = -1;
 
-    /* determine panel value width for later calculation of alignment */
+    // determine panel value width for later calculation of alignment
     if (type == TYPE_INTEGER || type == TYPE_STRING)
     {
       pos->width = pos->size * getFontWidth(pos->font);
@@ -2138,12 +2169,12 @@ static void InitGameControlValues(void)
       pos->height = pos->size;
     }
 
-    /* fill structure for game panel draw order */
+    // fill structure for game panel draw order
     gpo->nr = gpc->nr;
     gpo->sort_priority = pos->sort_priority;
   }
 
-  /* sort game panel controls according to sort_priority and control number */
+  // sort game panel controls according to sort_priority and control number
   qsort(game_panel_order, NUM_GAME_PANEL_CONTROLS,
        sizeof(struct GamePanelOrderInfo), compareGamePanelOrderInfo);
 }
@@ -2153,7 +2184,7 @@ static void UpdatePlayfieldElementCount(void)
   boolean use_element_count = FALSE;
   int i, j, x, y;
 
-  /* first check if it is needed at all to calculate playfield element count */
+  // first check if it is needed at all to calculate playfield element count
   for (i = GAME_PANEL_ELEMENT_COUNT_1; i <= GAME_PANEL_ELEMENT_COUNT_8; i++)
     if (!PANEL_DEACTIVATED(game_panel_controls[i].pos))
       use_element_count = TRUE;
@@ -2166,7 +2197,7 @@ static void UpdatePlayfieldElementCount(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    element_info[Feld[x][y]].element_count++;
+    element_info[Tile[x][y]].element_count++;
   }
 
   for (i = 0; i < NUM_GROUP_ELEMENTS; i++)
@@ -2179,52 +2210,53 @@ static void UpdatePlayfieldElementCount(void)
 static void UpdateGameControlValues(void)
 {
   int i, k;
-  int time = (local_player->LevelSolved ?
-             local_player->LevelSolved_CountingTime :
+  int time = (game.LevelSolved ?
+             game.LevelSolved_CountingTime :
              level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-             level.native_em_level->lev->time :
+             game_em.lev->time :
              level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-             level.native_sp_level->game_sp->time_played :
+             game_sp.time_played :
              level.game_engine_type == GAME_ENGINE_TYPE_MM ?
              game_mm.energy_left :
              game.no_time_limit ? TimePlayed : TimeLeft);
-  int score = (local_player->LevelSolved ?
-              local_player->LevelSolved_CountingScore :
+  int score = (game.LevelSolved ?
+              game.LevelSolved_CountingScore :
               level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-              level.native_em_level->lev->score :
+              game_em.lev->score :
               level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-              level.native_sp_level->game_sp->score :
+              game_sp.score :
               level.game_engine_type == GAME_ENGINE_TYPE_MM ?
               game_mm.score :
-              local_player->score);
+              game.score);
   int gems = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-             level.native_em_level->lev->required :
+             game_em.lev->gems_needed :
              level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-             level.native_sp_level->game_sp->infotrons_still_needed :
+             game_sp.infotrons_still_needed :
              level.game_engine_type == GAME_ENGINE_TYPE_MM ?
              game_mm.kettles_still_needed :
-             local_player->gems_still_needed);
+             game.gems_still_needed);
   int exit_closed = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-                    level.native_em_level->lev->required > 0 :
+                    game_em.lev->gems_needed > 0 :
                     level.game_engine_type == GAME_ENGINE_TYPE_SP ?
-                    level.native_sp_level->game_sp->infotrons_still_needed > 0 :
+                    game_sp.infotrons_still_needed > 0 :
                     level.game_engine_type == GAME_ENGINE_TYPE_MM ?
                     game_mm.kettles_still_needed > 0 ||
                     game_mm.lights_still_needed > 0 :
-                    local_player->gems_still_needed > 0 ||
-                    local_player->sokobanfields_still_needed > 0 ||
-                    local_player->lights_still_needed > 0);
-  int health = (local_player->LevelSolved ?
-               local_player->LevelSolved_CountingHealth :
+                    game.gems_still_needed > 0 ||
+                    game.sokoban_fields_still_needed > 0 ||
+                    game.sokoban_objects_still_needed > 0 ||
+                    game.lights_still_needed > 0);
+  int health = (game.LevelSolved ?
+               game.LevelSolved_CountingHealth :
                level.game_engine_type == GAME_ENGINE_TYPE_MM ?
                MM_HEALTH(game_mm.laser_overload_value) :
-               local_player->health);
+               game.health);
 
   UpdatePlayfieldElementCount();
 
-  /* update game panel control values */
+  // update game panel control values
 
-  /* used instead of "level_nr" (for network games) */
+  // used instead of "level_nr" (for network games)
   game_panel_controls[GAME_PANEL_LEVEL_NUMBER].value = levelset.level_nr;
   game_panel_controls[GAME_PANEL_GEMS].value = gems;
 
@@ -2238,7 +2270,7 @@ static void UpdateGameControlValues(void)
   {
     for (i = 0; i < MAX_PLAYERS; i++)
     {
-      /* only one player in Supaplex game engine */
+      // only one player in Supaplex game engine
       if (level.game_engine_type == GAME_ENGINE_TYPE_SP && i > 0)
        break;
 
@@ -2246,7 +2278,7 @@ static void UpdateGameControlValues(void)
       {
        if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
        {
-         if (level.native_em_level->ply[i]->keys & (1 << k))
+         if (game_em.ply[i]->keys & (1 << k))
            game_panel_controls[GAME_PANEL_KEY_1 + k].value =
              get_key_element_from_nr(k);
        }
@@ -2274,7 +2306,7 @@ static void UpdateGameControlValues(void)
     {
       if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
       {
-       if (level.native_em_level->ply[player_nr]->keys & (1 << k))
+       if (game_em.ply[player_nr]->keys & (1 << k))
          game_panel_controls[GAME_PANEL_KEY_1 + k].value =
            get_key_element_from_nr(k);
       }
@@ -2335,9 +2367,9 @@ static void UpdateGameControlValues(void)
     (exit_closed ? EL_EXIT_CLOSED : EL_EXIT_OPEN);
 
   game_panel_controls[GAME_PANEL_EMC_MAGIC_BALL].value =
-    (game.ball_state ? EL_EMC_MAGIC_BALL_ACTIVE : EL_EMC_MAGIC_BALL);
+    (game.ball_active ? EL_EMC_MAGIC_BALL_ACTIVE : EL_EMC_MAGIC_BALL);
   game_panel_controls[GAME_PANEL_EMC_MAGIC_BALL_SWITCH].value =
-    (game.ball_state ? EL_EMC_MAGIC_BALL_SWITCH_ACTIVE :
+    (game.ball_active ? EL_EMC_MAGIC_BALL_SWITCH_ACTIVE :
      EL_EMC_MAGIC_BALL_SWITCH);
 
   game_panel_controls[GAME_PANEL_LIGHT_SWITCH].value =
@@ -2378,12 +2410,12 @@ static void UpdateGameControlValues(void)
     (local_player->dynabomb_xl ? EL_DYNABOMB_INCREASE_POWER : EL_EMPTY);
 
   game_panel_controls[GAME_PANEL_PENGUINS].value =
-    local_player->friends_still_needed;
+    game.friends_still_needed;
 
   game_panel_controls[GAME_PANEL_SOKOBAN_OBJECTS].value =
-    local_player->sokobanfields_still_needed;
+    game.sokoban_objects_still_needed;
   game_panel_controls[GAME_PANEL_SOKOBAN_FIELDS].value =
-    local_player->sokobanfields_still_needed;
+    game.sokoban_fields_still_needed;
 
   game_panel_controls[GAME_PANEL_ROBOT_WHEEL].value =
     (game.robot_wheel_active ? EL_ROBOT_WHEEL_ACTIVE : EL_ROBOT_WHEEL);
@@ -2433,7 +2465,7 @@ static void UpdateGameControlValues(void)
   game_panel_controls[GAME_PANEL_LEVEL_NAME].value = 0;
   game_panel_controls[GAME_PANEL_LEVEL_AUTHOR].value = 0;
 
-  /* update game panel control frames */
+  // update game panel control frames
 
   for (i = 0; game_panel_controls[i].nr != -1; i++)
   {
@@ -2529,14 +2561,14 @@ static void DisplayGameControlValues(void)
   if (!redraw_panel)
     return;
 
-  /* copy default game door content to main double buffer */
+  // copy default game door content to main double buffer
 
-  /* !!! CHECK AGAIN !!! */
+  // !!! CHECK AGAIN !!!
   SetPanelBackground();
   // SetDoorBackgroundImage(IMG_BACKGROUND_PANEL);
   DrawBackground(DX, DY, DXSIZE, DYSIZE);
 
-  /* redraw game control buttons */
+  // redraw game control buttons
   RedrawGameButtons();
 
   SetGameStatus(GAME_MODE_PSEUDO_PANEL);
@@ -2567,7 +2599,7 @@ static void DisplayGameControlValues(void)
       {
        boolean use_dynamic_size = (size == -1 ? TRUE : FALSE);
 
-       if (use_dynamic_size)           /* use dynamic number of digits */
+       if (use_dynamic_size)           // use dynamic number of digits
        {
          int value_change = (nr == GAME_PANEL_LEVEL_NUMBER ? 100 : 1000);
          int size1 = (nr == GAME_PANEL_LEVEL_NUMBER ? 2 : 3);
@@ -2580,11 +2612,11 @@ static void DisplayGameControlValues(void)
        }
       }
 
-      /* correct text size if "digits" is zero or less */
+      // correct text size if "digits" is zero or less
       if (size <= 0)
        size = strlen(int2str(value, size));
 
-      /* dynamically correct text alignment */
+      // dynamically correct text alignment
       pos->width = size * getFontWidth(font);
 
       DrawTextExt(drawto, PANEL_XPOS(pos), PANEL_YPOS(pos),
@@ -2604,7 +2636,10 @@ static void DisplayGameControlValues(void)
        element = value;
        graphic = el2panelimg(value);
 
-       // printf("::: %d, '%s' [%d]\n", element, EL_NAME(element), size);
+#if 0
+       Debug("game:DisplayGameControlValues", "%d, '%s' [%d]",
+             element, EL_NAME(element), size);
+#endif
 
        if (element >= EL_GRAPHIC_1 && element <= EL_GRAPHIC_8 && size == 0)
          size = TILESIZE;
@@ -2724,8 +2759,8 @@ static void DisplayGameControlValues(void)
 
       if (nr == GAME_PANEL_GRAVITY_STATE)
       {
-       int font1 = pos->font;          /* (used for normal state) */
-       int font2 = pos->font_alt;      /* (used for active state) */
+       int font1 = pos->font;          // (used for normal state)
+       int font2 = pos->font_alt;      // (used for active state)
 
        font = (active ? font2 : font1);
       }
@@ -2736,10 +2771,10 @@ static void DisplayGameControlValues(void)
 
        if (size <= 0)
        {
-         /* don't truncate output if "chars" is zero or less */
+         // don't truncate output if "chars" is zero or less
          size = strlen(s);
 
-         /* dynamically correct text alignment */
+         // dynamically correct text alignment
          pos->width = size * getFontWidth(font);
        }
 
@@ -2780,23 +2815,21 @@ void DrawGameDoorValues(void)
 }
 
 
-/*
-  =============================================================================
-  InitGameEngine()
-  -----------------------------------------------------------------------------
-  initialize game engine due to level / tape version number
-  =============================================================================
-*/
+// ============================================================================
+// InitGameEngine()
+// ----------------------------------------------------------------------------
+// initialize game engine due to level / tape version number
+// ============================================================================
 
 static void InitGameEngine(void)
 {
   int i, j, k, l, x, y;
 
-  /* set game engine from tape file when re-playing, else from level file */
+  // set game engine from tape file when re-playing, else from level file
   game.engine_version = (tape.playing ? tape.engine_version :
                         level.game_version);
 
-  /* set single or multi-player game mode (needed for re-playing tapes) */
+  // set single or multi-player game mode (needed for re-playing tapes)
   game.team_mode = setup.team_mode;
 
   if (tape.playing)
@@ -2807,13 +2840,87 @@ static void InitGameEngine(void)
       if (tape.player_participates[i])
        num_players++;
 
-    /* multi-player tapes contain input data for more than one player */
+    // multi-player tapes contain input data for more than one player
     game.team_mode = (num_players > 1);
   }
 
-  /* ---------------------------------------------------------------------- */
-  /* set flags for bugs and changes according to active game engine version */
-  /* ---------------------------------------------------------------------- */
+#if 0
+  Debug("game:init:level", "level %d: level.game_version  == %06d", level_nr,
+       level.game_version);
+  Debug("game:init:level", "          tape.file_version   == %06d",
+       tape.file_version);
+  Debug("game:init:level", "          tape.game_version   == %06d",
+       tape.game_version);
+  Debug("game:init:level", "          tape.engine_version == %06d",
+       tape.engine_version);
+  Debug("game:init:level", "       => game.engine_version == %06d [tape mode: %s]",
+       game.engine_version, (tape.playing ? "PLAYING" : "RECORDING"));
+#endif
+
+  // --------------------------------------------------------------------------
+  // set flags for bugs and changes according to active game engine version
+  // --------------------------------------------------------------------------
+
+  /*
+    Summary of bugfix:
+    Fixed property "can fall" for run-time element "EL_AMOEBA_DROPPING"
+
+    Bug was introduced in version:
+    2.0.1
+
+    Bug was fixed in version:
+    4.2.0.0
+
+    Description:
+    In version 2.0.1, a new run-time element "EL_AMOEBA_DROPPING" was added,
+    but the property "can fall" was missing, which caused some levels to be
+    unsolvable. This was fixed in version 4.2.0.0.
+
+    Affected levels/tapes:
+    An example for a tape that was fixed by this bugfix is tape 029 from the
+    level set "rnd_sam_bateman".
+    The wrong behaviour will still be used for all levels or tapes that were
+    created/recorded with it. An example for this is tape 023 from the level
+    set "rnd_gerhard_haeusler", which was recorded with a buggy game engine.
+  */
+
+  boolean use_amoeba_dropping_cannot_fall_bug =
+    ((game.engine_version >= VERSION_IDENT(2,0,1,0) &&
+      game.engine_version <  VERSION_IDENT(4,2,0,0)) ||
+     (tape.playing &&
+      tape.game_version >= VERSION_IDENT(2,0,1,0) &&
+      tape.game_version <  VERSION_IDENT(4,2,0,0)));
+
+  /*
+    Summary of bugfix/change:
+    Fixed move speed of elements entering or leaving magic wall.
+
+    Fixed/changed in version:
+    2.0.1
+
+    Description:
+    Before 2.0.1, move speed of elements entering or leaving magic wall was
+    twice as fast as it is now.
+    Since 2.0.1, this is set to a lower value by using move_stepsize_list[].
+
+    Affected levels/tapes:
+    The first condition is generally needed for all levels/tapes before version
+    2.0.1, which might use the old behaviour before it was changed; known tapes
+    that are affected: Tape 014 from the level set "rnd_conor_mancone".
+    The second condition is an exception from the above case and is needed for
+    the special case of tapes recorded with game (not engine!) version 2.0.1 or
+    above, but before it was known that this change would break tapes like the
+    above and was fixed in 4.2.0.0, so that the changed behaviour was active
+    although the engine version while recording maybe was before 2.0.1. There
+    are a lot of tapes that are affected by this exception, like tape 006 from
+    the level set "rnd_conor_mancone".
+  */
+
+  boolean use_old_move_stepsize_for_magic_wall =
+    (game.engine_version < VERSION_IDENT(2,0,1,0) &&
+     !(tape.playing &&
+       tape.game_version >= VERSION_IDENT(2,0,1,0) &&
+       tape.game_version <  VERSION_IDENT(4,2,0,0)));
 
   /*
     Summary of bugfix/change:
@@ -2877,58 +2984,70 @@ static void InitGameEngine(void)
   game.use_block_last_field_bug =
     (game.engine_version < VERSION_IDENT(3,1,1,0));
 
+  /* various special flags and settings for native Emerald Mine game engine */
+
   game_em.use_single_button =
     (game.engine_version > VERSION_IDENT(4,0,0,2));
 
   game_em.use_snap_key_bug =
     (game.engine_version < VERSION_IDENT(4,0,1,0));
 
-  /* ---------------------------------------------------------------------- */
+  game_em.use_random_bug =
+    (tape.property_bits & TAPE_PROPERTY_EM_RANDOM_BUG);
+
+  boolean use_old_em_engine = (game.engine_version < VERSION_IDENT(4,2,0,0));
 
-  /* set maximal allowed number of custom element changes per game frame */
+  game_em.use_old_explosions           = use_old_em_engine;
+  game_em.use_old_android              = use_old_em_engine;
+  game_em.use_old_push_elements                = use_old_em_engine;
+  game_em.use_old_push_into_acid       = use_old_em_engine;
+
+  game_em.use_wrap_around              = !use_old_em_engine;
+
+  // --------------------------------------------------------------------------
+
+  // set maximal allowed number of custom element changes per game frame
   game.max_num_changes_per_frame = 1;
 
-  /* default scan direction: scan playfield from top/left to bottom/right */
+  // default scan direction: scan playfield from top/left to bottom/right
   InitPlayfieldScanMode(CA_ARG_SCAN_MODE_NORMAL);
 
-  /* dynamically adjust element properties according to game engine version */
+  // dynamically adjust element properties according to game engine version
   InitElementPropertiesEngine(game.engine_version);
 
-#if 0
-  printf("level %d: level version == %06d\n", level_nr, level.game_version);
-  printf("          tape version == %06d [%s] [file: %06d]\n",
-        tape.engine_version, (tape.playing ? "PLAYING" : "RECORDING"),
-        tape.file_version);
-  printf("       => game.engine_version == %06d\n", game.engine_version);
-#endif
+  // ---------- initialize special element properties -------------------------
+
+  // "EL_AMOEBA_DROPPING" missed property "can fall" in older game versions
+  if (use_amoeba_dropping_cannot_fall_bug)
+    SET_PROPERTY(EL_AMOEBA_DROPPING, EP_CAN_FALL, FALSE);
 
-  /* ---------- initialize player's initial move delay --------------------- */
+  // ---------- initialize player's initial move delay ------------------------
 
-  /* dynamically adjust player properties according to level information */
+  // dynamically adjust player properties according to level information
   for (i = 0; i < MAX_PLAYERS; i++)
     game.initial_move_delay_value[i] =
       get_move_delay_from_stepsize(level.initial_player_stepsize[i]);
 
-  /* dynamically adjust player properties according to game engine version */
+  // dynamically adjust player properties according to game engine version
   for (i = 0; i < MAX_PLAYERS; i++)
     game.initial_move_delay[i] =
       (game.engine_version <= VERSION_IDENT(2,0,1,0) ?
        game.initial_move_delay_value[i] : 0);
 
-  /* ---------- initialize player's initial push delay --------------------- */
+  // ---------- initialize player's initial push delay ------------------------
 
-  /* dynamically adjust player properties according to game engine version */
+  // dynamically adjust player properties according to game engine version
   game.initial_push_delay_value =
     (game.engine_version < VERSION_IDENT(3,0,7,1) ? 5 : -1);
 
-  /* ---------- initialize changing elements ------------------------------- */
+  // ---------- initialize changing elements ----------------------------------
 
-  /* initialize changing elements information */
+  // initialize changing elements information
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     struct ElementInfo *ei = &element_info[i];
 
-    /* this pointer might have been changed in the level editor */
+    // this pointer might have been changed in the level editor
     ei->change = &ei->change_page[0];
 
     if (!IS_CUSTOM_ELEMENT(i))
@@ -2948,7 +3067,7 @@ static void InitGameEngine(void)
     }
   }
 
-  /* add changing elements from pre-defined list */
+  // add changing elements from pre-defined list
   for (i = 0; change_delay_list[i].element != EL_UNDEFINED; i++)
   {
     struct ChangingElementInfo *ch_delay = &change_delay_list[i];
@@ -2970,7 +3089,7 @@ static void InitGameEngine(void)
     SET_PROPERTY(ch_delay->element, EP_CAN_CHANGE_OR_HAS_ACTION, TRUE);
   }
 
-  /* ---------- initialize internal run-time variables --------------------- */
+  // ---------- initialize internal run-time variables ------------------------
 
   for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
@@ -2984,7 +3103,7 @@ static void InitGameEngine(void)
     }
   }
 
-  /* add change events from custom element configuration */
+  // add change events from custom element configuration
   for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
     struct ElementInfo *ei = &element_info[EL_CUSTOM_START + i];
@@ -2996,7 +3115,7 @@ static void InitGameEngine(void)
 
       for (k = 0; k < NUM_CHANGE_EVENTS; k++)
       {
-       /* only add event page for the first page found with this event */
+       // only add event page for the first page found with this event
        if (ei->change_page[j].has_event[k] && !(ei->has_change_event[k]))
        {
          ei->has_change_event[k] = TRUE;
@@ -3008,7 +3127,7 @@ static void InitGameEngine(void)
     }
   }
 
-  /* ---------- initialize reference elements in change conditions --------- */
+  // ---------- initialize reference elements in change conditions ------------
 
   for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
@@ -3027,7 +3146,7 @@ static void InitGameEngine(void)
     }
   }
 
-  /* ---------- initialize run-time trigger player and element ------------- */
+  // ---------- initialize run-time trigger player and element ----------------
 
   for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
   {
@@ -3044,14 +3163,14 @@ static void InitGameEngine(void)
     }
   }
 
-  /* ---------- initialize trigger events ---------------------------------- */
+  // ---------- initialize trigger events -------------------------------------
 
-  /* initialize trigger events information */
+  // initialize trigger events information
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     for (j = 0; j < NUM_CHANGE_EVENTS; j++)
       trigger_events[i][j] = FALSE;
 
-  /* add trigger events from element change event properties */
+  // add trigger events from element change event properties
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     struct ElementInfo *ei = &element_info[i];
@@ -3088,14 +3207,14 @@ static void InitGameEngine(void)
     }
   }
 
-  /* ---------- initialize push delay -------------------------------------- */
+  // ---------- initialize push delay -----------------------------------------
 
-  /* initialize push delay values to default */
+  // initialize push delay values to default
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     if (!IS_CUSTOM_ELEMENT(i))
     {
-      /* set default push delay values (corrected since version 3.0.7-1) */
+      // set default push delay values (corrected since version 3.0.7-1)
       if (game.engine_version < VERSION_IDENT(3,0,7,1))
       {
        element_info[i].push_delay_fixed = 2;
@@ -3109,7 +3228,7 @@ static void InitGameEngine(void)
     }
   }
 
-  /* set push delay value for certain elements from pre-defined list */
+  // set push delay value for certain elements from pre-defined list
   for (i = 0; push_delay_list[i].element != EL_UNDEFINED; i++)
   {
     int e = push_delay_list[i].element;
@@ -3118,14 +3237,14 @@ static void InitGameEngine(void)
     element_info[e].push_delay_random = push_delay_list[i].push_delay_random;
   }
 
-  /* set push delay value for Supaplex elements for newer engine versions */
+  // set push delay value for Supaplex elements for newer engine versions
   if (game.engine_version >= VERSION_IDENT(3,1,0,0))
   {
     for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     {
       if (IS_SP_ELEMENT(i))
       {
-       /* set SP push delay to just enough to push under a falling zonk */
+       // set SP push delay to just enough to push under a falling zonk
        int delay = (game.engine_version >= VERSION_IDENT(3,1,1,0) ? 8 : 6);
 
        element_info[i].push_delay_fixed  = delay;
@@ -3134,53 +3253,63 @@ static void InitGameEngine(void)
     }
   }
 
-  /* ---------- initialize move stepsize ----------------------------------- */
+  // ---------- initialize move stepsize --------------------------------------
 
-  /* initialize move stepsize values to default */
+  // initialize move stepsize values to default
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (!IS_CUSTOM_ELEMENT(i))
       element_info[i].move_stepsize = MOVE_STEPSIZE_NORMAL;
 
-  /* set move stepsize value for certain elements from pre-defined list */
+  // set move stepsize value for certain elements from pre-defined list
   for (i = 0; move_stepsize_list[i].element != EL_UNDEFINED; i++)
   {
     int e = move_stepsize_list[i].element;
 
     element_info[e].move_stepsize = move_stepsize_list[i].move_stepsize;
+
+    // set move stepsize value for certain elements for older engine versions
+    if (use_old_move_stepsize_for_magic_wall)
+    {
+      if (e == EL_MAGIC_WALL_FILLING ||
+         e == EL_MAGIC_WALL_EMPTYING ||
+         e == EL_BD_MAGIC_WALL_FILLING ||
+         e == EL_BD_MAGIC_WALL_EMPTYING)
+       element_info[e].move_stepsize *= 2;
+    }
   }
 
-  /* ---------- initialize collect score ----------------------------------- */
+  // ---------- initialize collect score --------------------------------------
 
-  /* initialize collect score values for custom elements from initial value */
+  // initialize collect score values for custom elements from initial value
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (IS_CUSTOM_ELEMENT(i))
       element_info[i].collect_score = element_info[i].collect_score_initial;
 
-  /* ---------- initialize collect count ----------------------------------- */
+  // ---------- initialize collect count --------------------------------------
 
-  /* initialize collect count values for non-custom elements */
+  // initialize collect count values for non-custom elements
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (!IS_CUSTOM_ELEMENT(i))
       element_info[i].collect_count_initial = 0;
 
-  /* add collect count values for all elements from pre-defined list */
+  // add collect count values for all elements from pre-defined list
   for (i = 0; collect_count_list[i].element != EL_UNDEFINED; i++)
     element_info[collect_count_list[i].element].collect_count_initial =
       collect_count_list[i].count;
 
-  /* ---------- initialize access direction -------------------------------- */
+  // ---------- initialize access direction -----------------------------------
 
-  /* initialize access direction values to default (access from every side) */
+  // initialize access direction values to default (access from every side)
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
     if (!IS_CUSTOM_ELEMENT(i))
       element_info[i].access_direction = MV_ALL_DIRECTIONS;
 
-  /* set access direction value for certain elements from pre-defined list */
+  // set access direction value for certain elements from pre-defined list
   for (i = 0; access_direction_list[i].element != EL_UNDEFINED; i++)
     element_info[access_direction_list[i].element].access_direction =
       access_direction_list[i].direction;
 
-  /* ---------- initialize explosion content ------------------------------- */
+  // ---------- initialize explosion content ----------------------------------
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     if (IS_CUSTOM_ELEMENT(i))
@@ -3188,7 +3317,7 @@ static void InitGameEngine(void)
 
     for (y = 0; y < 3; y++) for (x = 0; x < 3; x++)
     {
-      /* (content for EL_YAMYAM set at run-time with game.yamyam_content_nr) */
+      // (content for EL_YAMYAM set at run-time with game.yamyam_content_nr)
 
       element_info[i].content.e[x][y] =
        (i == EL_PLAYER_1 ? EL_EMERALD_YELLOW :
@@ -3213,19 +3342,21 @@ static void InitGameEngine(void)
     }
   }
 
-  /* ---------- initialize recursion detection ------------------------------ */
+  // ---------- initialize recursion detection --------------------------------
   recursion_loop_depth = 0;
   recursion_loop_detected = FALSE;
   recursion_loop_element = EL_UNDEFINED;
 
-  /* ---------- initialize graphics engine ---------------------------------- */
+  // ---------- initialize graphics engine ------------------------------------
   game.scroll_delay_value =
     (game.forced_scroll_delay_value != -1 ? game.forced_scroll_delay_value :
+     level.game_engine_type == GAME_ENGINE_TYPE_EM &&
+     !setup.forced_scroll_delay           ? 0 :
      setup.scroll_delay                   ? setup.scroll_delay_value       : 0);
   game.scroll_delay_value =
     MIN(MAX(MIN_SCROLL_DELAY, game.scroll_delay_value), MAX_SCROLL_DELAY);
 
-  /* ---------- initialize game engine snapshots ---------------------------- */
+  // ---------- initialize game engine snapshots ------------------------------
   for (i = 0; i < MAX_PLAYERS; i++)
     game.snapshot.last_action[i] = 0;
   game.snapshot.changed_action = FALSE;
@@ -3239,10 +3370,38 @@ static void InitGameEngine(void)
      SNAPSHOT_MODE_EVERY_COLLECT : SNAPSHOT_MODE_OFF);
   game.snapshot.save_snapshot = FALSE;
 
-  /* ---------- initialize level time for Supaplex engine ------------------- */
-  /* Supaplex levels with time limit currently unsupported -- should be added */
+  // ---------- initialize level time for Supaplex engine ---------------------
+  // Supaplex levels with time limit currently unsupported -- should be added
   if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
     level.time = 0;
+
+  // ---------- initialize flags for handling game actions --------------------
+
+  // set flags for game actions to default values
+  game.use_key_actions = TRUE;
+  game.use_mouse_actions = FALSE;
+
+  // when using Mirror Magic game engine, handle mouse events only
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+  {
+    game.use_key_actions = FALSE;
+    game.use_mouse_actions = TRUE;
+  }
+
+  // check for custom elements with mouse click events
+  if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
+  {
+    for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++)
+    {
+      int element = EL_CUSTOM_START + i;
+
+      if (HAS_CHANGE_EVENT(element, CE_CLICKED_BY_MOUSE) ||
+         HAS_CHANGE_EVENT(element, CE_PRESSED_BY_MOUSE) ||
+         HAS_CHANGE_EVENT(element, CE_MOUSE_CLICKED_ON_X) ||
+         HAS_CHANGE_EVENT(element, CE_MOUSE_PRESSED_ON_X))
+       game.use_mouse_actions = TRUE;
+    }
+  }
 }
 
 static int get_num_special_action(int element, int action_first,
@@ -3270,13 +3429,11 @@ static int get_num_special_action(int element, int action_first,
 }
 
 
-/*
-  =============================================================================
-  InitGame()
-  -----------------------------------------------------------------------------
-  initialize and start new game
-  =============================================================================
-*/
+// ============================================================================
+// InitGame()
+// ----------------------------------------------------------------------------
+// initialize and start new game
+// ============================================================================
 
 #if DEBUG_INIT_PLAYER
 static void DebugPrintPlayerStatus(char *message)
@@ -3286,24 +3443,21 @@ static void DebugPrintPlayerStatus(char *message)
   if (!options.debug)
     return;
 
-  printf("%s:\n", message);
+  Debug("game:init:player", "%s:", message);
 
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
 
-    printf("- player %d: present == %d, connected == %d [%d/%d], active == %d",
-          i + 1,
-          player->present,
-          player->connected,
-          player->connected_locally,
-          player->connected_network,
-          player->active);
-
-    if (local_player == player)
-      printf(" (local player)");
-
-    printf("\n");
+    Debug("game:init:player",
+         "- player %d: present == %d, connected == %d [%d/%d], active == %d%s",
+         i + 1,
+         player->present,
+         player->connected,
+         player->connected_locally,
+         player->connected_network,
+         player->active,
+         (local_player == player ? " (local player)" : ""));
   }
 }
 #endif
@@ -3314,9 +3468,9 @@ void InitGame(void)
   int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
   int fade_mask = REDRAW_FIELD;
 
-  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 */
+  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
   int initial_move_dir = MV_DOWN;
   int i, j, x, y;
 
@@ -3329,11 +3483,11 @@ void InitGame(void)
   SetGameStatus(GAME_MODE_PLAYING);
 
   if (level_editor_test_game)
-    FadeSkipNextFadeIn();
+    FadeSkipNextFadeOut();
   else
     FadeSetEnterScreen();
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeLevelSoundsAndMusic();
@@ -3342,7 +3496,10 @@ void InitGame(void)
 
   FadeOut(fade_mask);
 
-  /* needed if different viewport properties defined for playing */
+  if (level_editor_test_game)
+    FadeSkipNextFadeIn();
+
+  // needed if different viewport properties defined for playing
   ChangeViewportPropertiesIfNeeded();
 
   ClearField();
@@ -3354,7 +3511,14 @@ void InitGame(void)
   InitGameEngine();
   InitGameControlValues();
 
-  /* don't play tapes over network */
+  // initialize tape actions from game when recording tape
+  if (tape.recording)
+  {
+    tape.use_key_actions   = game.use_key_actions;
+    tape.use_mouse_actions = game.use_mouse_actions;
+  }
+
+  // don't play tapes over network
   network_playing = (network.enabled && !tape.playing);
 
   for (i = 0; i < MAX_PLAYERS; i++)
@@ -3371,10 +3535,12 @@ void InitGame(void)
 
     player->killed = FALSE;
     player->reanimated = FALSE;
+    player->buried = FALSE;
 
     player->action = 0;
     player->effective_action = 0;
     player->programmed_action = 0;
+    player->snap_action = 0;
 
     player->mouse_action.lx = 0;
     player->mouse_action.ly = 0;
@@ -3386,18 +3552,6 @@ void InitGame(void)
     player->effective_mouse_action.button = 0;
     player->effective_mouse_action.button_hint = 0;
 
-    player->score = 0;
-    player->score_final = 0;
-
-    player->health = MAX_HEALTH;
-    player->health_final = MAX_HEALTH;
-
-    player->gems_still_needed = level.gems_needed;
-    player->sokobanfields_still_needed = 0;
-    player->lights_still_needed = 0;
-    player->players_still_needed = 0;
-    player->friends_still_needed = 0;
-
     for (j = 0; j < MAX_NUM_KEYS; j++)
       player->key[j] = FALSE;
 
@@ -3422,8 +3576,8 @@ void InitGame(void)
        player->element_nr);
     player->use_murphy = FALSE;
 
-    player->block_last_field = FALSE;  /* initialized in InitPlayerField() */
-    player->block_delay_adjustment = 0;        /* initialized in InitPlayerField() */
+    player->block_last_field = FALSE;  // initialized in InitPlayerField()
+    player->block_delay_adjustment = 0;        // initialized in InitPlayerField()
 
     player->gravity = level.initial_player_gravity[i];
 
@@ -3480,7 +3634,7 @@ void InitGame(void)
 
     SetPlayerMoveSpeed(player, level.initial_player_stepsize[i], TRUE);
 
-    player->push_delay       = -1;     /* initialized when pushing starts */
+    player->push_delay       = -1;     // initialized when pushing starts
     player->push_delay_value = game.initial_push_delay_value;
 
     player->drop_delay = 0;
@@ -3520,30 +3674,15 @@ void InitGame(void)
     DigField(player, 0, 0, 0, 0, 0, 0, DF_NO_PUSH);
     SnapField(player, 0, 0);
 
-    player->LevelSolved = FALSE;
-    player->GameOver = FALSE;
-
-    player->LevelSolved_GameWon = FALSE;
-    player->LevelSolved_GameEnd = FALSE;
-    player->LevelSolved_SaveTape = FALSE;
-    player->LevelSolved_SaveScore = FALSE;
-
-    player->LevelSolved_CountingTime = 0;
-    player->LevelSolved_CountingScore = 0;
-    player->LevelSolved_CountingHealth = 0;
-
     map_player_action[i] = i;
   }
 
   network_player_action_received = FALSE;
 
-  /* initial null action */
+  // initial null action
   if (network_playing)
     SendToServer_MovePlayer(MV_NONE);
 
-  ZX = ZY = -1;
-  ExitX = ExitY = -1;
-
   FrameCounter = 0;
   TimeFrames = 0;
   TimePlayed = 0;
@@ -3554,9 +3693,29 @@ void InitGame(void)
   ScreenMovPos = 0;
   ScreenGfxPos = 0;
 
-  ScrollStepSize = 0;  /* will be correctly initialized by ScrollScreen() */
+  ScrollStepSize = 0;  // will be correctly initialized by ScrollScreen()
+
+  game.robot_wheel_x = -1;
+  game.robot_wheel_y = -1;
+
+  game.exit_x = -1;
+  game.exit_y = -1;
+
+  game.all_players_gone = FALSE;
+
+  game.LevelSolved = FALSE;
+  game.GameOver = FALSE;
+
+  game.GamePlayed = !tape.playing;
 
-  AllPlayersGone = FALSE;
+  game.LevelSolved_GameWon = FALSE;
+  game.LevelSolved_GameEnd = FALSE;
+  game.LevelSolved_SaveTape = FALSE;
+  game.LevelSolved_SaveScore = FALSE;
+
+  game.LevelSolved_CountingTime = 0;
+  game.LevelSolved_CountingScore = 0;
+  game.LevelSolved_CountingHealth = 0;
 
   game.panel.active = TRUE;
 
@@ -3571,10 +3730,23 @@ void InitGame(void)
   game.switchgate_pos = 0;
   game.wind_direction = level.wind_direction_initial;
 
+  game.score = 0;
+  game.score_final = 0;
+
+  game.health = MAX_HEALTH;
+  game.health_final = MAX_HEALTH;
+
+  game.gems_still_needed = level.gems_needed;
+  game.sokoban_fields_still_needed = 0;
+  game.sokoban_objects_still_needed = 0;
+  game.lights_still_needed = 0;
+  game.players_still_needed = 0;
+  game.friends_still_needed = 0;
+
   game.lenses_time_left = 0;
   game.magnify_time_left = 0;
 
-  game.ball_state = level.ball_state_initial;
+  game.ball_active = level.ball_active_initial;
   game.ball_content_nr = 0;
 
   game.explosions_delayed = TRUE;
@@ -3584,7 +3756,7 @@ void InitGame(void)
   for (i = 0; i < NUM_BELTS; i++)
   {
     game.belt_dir[i] = MV_NONE;
-    game.belt_dir_nr[i] = 3;           /* not moving, next moving left */
+    game.belt_dir_nr[i] = 3;           // not moving, next moving left
   }
 
   for (i = 0; i < MAX_NUM_AMOEBA; i++)
@@ -3596,11 +3768,11 @@ void InitGame(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    Feld[x][y] = Last[x][y] = level.field[x][y];
+    Tile[x][y] = Last[x][y] = level.field[x][y];
     MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
     ChangeDelay[x][y] = 0;
     ChangePage[x][y] = -1;
-    CustomValue[x][y] = 0;             /* initialized in InitField() */
+    CustomValue[x][y] = 0;             // initialized in InitField()
     Store[x][y] = Store2[x][y] = StorePlayer[x][y] = Back[x][y] = 0;
     AmoebaNr[x][y] = 0;
     WasJustMoving[x][y] = 0;
@@ -3630,11 +3802,11 @@ void InitGame(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    if (emulate_bd && !IS_BD_ELEMENT(Feld[x][y]))
+    if (emulate_bd && !IS_BD_ELEMENT(Tile[x][y]))
       emulate_bd = FALSE;
-    if (emulate_sb && !IS_SB_ELEMENT(Feld[x][y]))
+    if (emulate_sb && !IS_SB_ELEMENT(Tile[x][y]))
       emulate_sb = FALSE;
-    if (emulate_sp && !IS_SP_ELEMENT(Feld[x][y]))
+    if (emulate_sp && !IS_SP_ELEMENT(Tile[x][y]))
       emulate_sp = FALSE;
 
     InitField(x, y, TRUE);
@@ -3648,7 +3820,7 @@ void InitGame(void)
   {
     struct PlayerInfo *player = &stored_player[i];
 
-    /* set number of special actions for bored and sleeping animation */
+    // set number of special actions for bored and sleeping animation
     player->num_special_action_bored =
       get_num_special_action(player->artwork_element,
                             ACTION_BORING_1, ACTION_BORING_LAST);
@@ -3661,25 +3833,25 @@ void InitGame(void)
                    emulate_sb ? EMU_SOKOBAN :
                    emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
 
-  /* initialize type of slippery elements */
+  // initialize type of slippery elements
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     if (!IS_CUSTOM_ELEMENT(i))
     {
-      /* default: elements slip down either to the left or right randomly */
+      // default: elements slip down either to the left or right randomly
       element_info[i].slippery_type = SLIPPERY_ANY_RANDOM;
 
-      /* SP style elements prefer to slip down on the left side */
+      // SP style elements prefer to slip down on the left side
       if (game.engine_version >= VERSION_IDENT(3,1,1,0) && IS_SP_ELEMENT(i))
        element_info[i].slippery_type = SLIPPERY_ANY_LEFT_RIGHT;
 
-      /* BD style elements prefer to slip down on the left side */
+      // BD style elements prefer to slip down on the left side
       if (game.emulation == EMU_BOULDERDASH)
        element_info[i].slippery_type = SLIPPERY_ANY_LEFT_RIGHT;
     }
   }
 
-  /* initialize explosion and ignition delay */
+  // initialize explosion and ignition delay
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
     if (!IS_CUSTOM_ELEMENT(i))
@@ -3699,17 +3871,31 @@ void InitGame(void)
     }
   }
 
-  /* correct non-moving belts to start moving left */
+  // correct non-moving belts to start moving left
   for (i = 0; i < NUM_BELTS; i++)
     if (game.belt_dir[i] == MV_NONE)
-      game.belt_dir_nr[i] = 3;         /* not moving, next moving left */
+      game.belt_dir_nr[i] = 3;         // not moving, next moving left
 
 #if USE_NEW_PLAYER_ASSIGNMENTS
+  // use preferred player also in local single-player mode
+  if (!network.enabled && !game.team_mode)
+  {
+    int new_index_nr = setup.network_player_nr;
+
+    if (new_index_nr >= 0 && new_index_nr < MAX_PLAYERS)
+    {
+      for (i = 0; i < MAX_PLAYERS; i++)
+       stored_player[i].connected_locally = FALSE;
+
+      stored_player[new_index_nr].connected_locally = TRUE;
+    }
+  }
+
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     stored_player[i].connected = FALSE;
 
-    /* in network game mode, the local player might not be the first player */
+    // in network game mode, the local player might not be the first player
     if (stored_player[i].connected_locally)
       local_player = &stored_player[i];
   }
@@ -3724,8 +3910,8 @@ void InitGame(void)
   }
   else if (network.enabled)
   {
-    /* add team mode players connected over the network (needed for correct
-       assignment of player figures from level to locally playing players) */
+    // add team mode players connected over the network (needed for correct
+    // assignment of player figures from level to locally playing players)
 
     for (i = 0; i < MAX_PLAYERS; i++)
       if (stored_player[i].connected_network)
@@ -3733,8 +3919,8 @@ void InitGame(void)
   }
   else if (game.team_mode)
   {
-    /* try to guess locally connected team mode players (needed for correct
-       assignment of player figures from level to locally playing players) */
+    // try to guess locally connected team mode players (needed for correct
+    // assignment of player figures from level to locally playing players)
 
     for (i = 0; i < MAX_PLAYERS; i++)
       if (setup.input[i].use_joystick ||
@@ -3747,11 +3933,10 @@ void InitGame(void)
 #endif
 
 #if DEBUG_INIT_PLAYER
-  if (options.debug)
-    printf("Reassigning players ...\n");
+  Debug("game:init:player", "Reassigning players ...");
 #endif
 
-  /* check if any connected player was not found in playfield */
+  // check if any connected player was not found in playfield
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
@@ -3761,13 +3946,13 @@ void InitGame(void)
       struct PlayerInfo *field_player = NULL;
 
 #if DEBUG_INIT_PLAYER
-      if (options.debug)
-       printf("- looking for field player for player %d ...\n", i + 1);
+      Debug("game:init:player",
+           "- looking for field player for player %d ...", i + 1);
 #endif
 
-      /* assign first free player found that is present in the playfield */
+      // assign first free player found that is present in the playfield
 
-      /* first try: look for unmapped playfield player that is not connected */
+      // first try: look for unmapped playfield player that is not connected
       for (j = 0; j < MAX_PLAYERS; j++)
        if (field_player == NULL &&
            stored_player[j].present &&
@@ -3775,7 +3960,7 @@ void InitGame(void)
            !stored_player[j].connected)
          field_player = &stored_player[j];
 
-      /* second try: look for *any* unmapped playfield player */
+      // second try: look for *any* unmapped playfield player
       for (j = 0; j < MAX_PLAYERS; j++)
        if (field_player == NULL &&
            stored_player[j].present &&
@@ -3787,8 +3972,8 @@ void InitGame(void)
        int jx = field_player->jx, jy = field_player->jy;
 
 #if DEBUG_INIT_PLAYER
-       if (options.debug)
-         printf("- found player %d\n", field_player->index_nr + 1);
+       Debug("game:init:player", "- found player %d",
+             field_player->index_nr + 1);
 #endif
 
        player->present = FALSE;
@@ -3818,9 +4003,8 @@ void InitGame(void)
        field_player->mapped = TRUE;
 
 #if DEBUG_INIT_PLAYER
-       if (options.debug)
-         printf("- map_player_action[%d] == %d\n",
-                field_player->index_nr + 1, i + 1);
+       Debug("game:init:player", "- map_player_action[%d] == %d",
+             field_player->index_nr + 1, i + 1);
 #endif
       }
     }
@@ -3835,7 +4019,7 @@ void InitGame(void)
 
 #else
 
-  /* check if any connected player was not found in playfield */
+  // check if any connected player was not found in playfield
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     struct PlayerInfo *player = &stored_player[i];
@@ -3847,7 +4031,7 @@ void InitGame(void)
        struct PlayerInfo *field_player = &stored_player[j];
        int jx = field_player->jx, jy = field_player->jy;
 
-       /* assign first free player found that is present in the playfield */
+       // assign first free player found that is present in the playfield
        if (field_player->present && !field_player->connected)
        {
          player->present = TRUE;
@@ -3875,24 +4059,26 @@ void InitGame(void)
 #endif
 
 #if 0
-  printf("::: local_player->present == %d\n", local_player->present);
+  Debug("game:init:player", "local_player->present == %d",
+       local_player->present);
 #endif
 
-  /* set focus to local player for network games, else to all players */
+  // set focus to local player for network games, else to all players
   game.centered_player_nr = (network_playing ? local_player->index_nr : -1);
   game.centered_player_nr_next = game.centered_player_nr;
   game.set_centered_player = FALSE;
+  game.set_centered_player_wrap = FALSE;
 
   if (network_playing && tape.recording)
   {
-    /* store client dependent player focus when recording network games */
+    // store client dependent player focus when recording network games
     tape.centered_player_nr_next = game.centered_player_nr_next;
     tape.set_centered_player = TRUE;
   }
 
   if (tape.playing)
   {
-    /* when playing a tape, eliminate all players who do not participate */
+    // when playing a tape, eliminate all players who do not participate
 
 #if USE_NEW_PLAYER_ASSIGNMENTS
 
@@ -3907,13 +4093,13 @@ void InitGame(void)
          int jx = player->jx, jy = player->jy;
 
 #if DEBUG_INIT_PLAYER
-         if (options.debug)
-           printf("Removing player %d at (%d, %d)\n", i + 1, jx, jy);
+         Debug("game:init:player", "Removing player %d at (%d, %d)",
+               i + 1, jx, jy);
 #endif
 
          player->active = FALSE;
          StorePlayer[jx][jy] = 0;
-         Feld[jx][jy] = EL_EMPTY;
+         Tile[jx][jy] = EL_EMPTY;
        }
       }
     }
@@ -3930,14 +4116,14 @@ void InitGame(void)
 
        player->active = FALSE;
        StorePlayer[jx][jy] = 0;
-       Feld[jx][jy] = EL_EMPTY;
+       Tile[jx][jy] = EL_EMPTY;
       }
     }
 #endif
   }
-  else if (!network.enabled && !game.team_mode)                /* && !tape.playing */
+  else if (!network.enabled && !game.team_mode)                // && !tape.playing
   {
-    /* when in single player mode, eliminate all but the local player */
+    // when in single player mode, eliminate all but the local player
 
     for (i = 0; i < MAX_PLAYERS; i++)
     {
@@ -3951,19 +4137,19 @@ void InitGame(void)
        player->present = FALSE;
 
        StorePlayer[jx][jy] = 0;
-       Feld[jx][jy] = EL_EMPTY;
+       Tile[jx][jy] = EL_EMPTY;
       }
     }
   }
 
   for (i = 0; i < MAX_PLAYERS; i++)
     if (stored_player[i].active)
-      local_player->players_still_needed++;
+      game.players_still_needed++;
 
   if (level.solved_by_one_player)
-    local_player->players_still_needed = 1;
+    game.players_still_needed = 1;
 
-  /* when recording the game, store which players take part in the game */
+  // when recording the game, store which players take part in the game
   if (tape.recording)
   {
 #if USE_NEW_PLAYER_ASSIGNMENTS
@@ -4006,8 +4192,8 @@ void InitGame(void)
   if (EVEN(SCR_FIELDY) && full_lev_fieldy > SCR_FIELDY)
     SBY_Upper--;
 
-  /* if local player not found, look for custom element that might create
-     the player (make some assumptions about the right custom element) */
+  // if local player not found, look for custom element that might create
+  // the player (make some assumptions about the right custom element)
   if (!local_player->present)
   {
     int start_x = 0, start_y = 0;
@@ -4017,7 +4203,7 @@ void InitGame(void)
 
     SCAN_PLAYFIELD(x, y)
     {
-      int element = Feld[x][y];
+      int element = Tile[x][y];
       int content;
       int xx, yy;
       boolean is_player;
@@ -4040,7 +4226,7 @@ void InitGame(void)
       {
        for (i = 0; i < element_info[element].num_change_pages; i++)
        {
-         /* check for player created from custom element as single target */
+         // check for player created from custom element as single target
          content = element_info[element].change_page[i].target_element;
          is_player = ELEM_IS_PLAYER(content);
 
@@ -4058,7 +4244,7 @@ void InitGame(void)
 
       for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3; xx++)
       {
-       /* check for player created from custom element as explosion content */
+       // check for player created from custom element as explosion content
        content = element_info[element].content.e[xx][yy];
        is_player = ELEM_IS_PLAYER(content);
 
@@ -4077,7 +4263,7 @@ void InitGame(void)
 
        for (i = 0; i < element_info[element].num_change_pages; i++)
        {
-         /* check for player created from custom element as extended target */
+         // check for player created from custom element as extended target
          content =
            element_info[element].change_page[i].target_content.e[xx][yy];
 
@@ -4105,7 +4291,7 @@ void InitGame(void)
     scroll_y = SCROLL_POSITION_Y(local_player->jy);
   }
 
-  /* !!! FIX THIS (START) !!! */
+  // !!! FIX THIS (START) !!!
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {
     InitGameEngine_EM();
@@ -4123,14 +4309,14 @@ void InitGame(void)
     DrawLevel(REDRAW_FIELD);
     DrawAllPlayers();
 
-    /* after drawing the level, correct some elements */
+    // after drawing the level, correct some elements
     if (game.timegate_time_left == 0)
       CloseAllOpenTimegates();
   }
 
-  /* blit playfield from scroll buffer to normal back buffer for fading in */
+  // blit playfield from scroll buffer to normal back buffer for fading in
   BlitScreenToBitmap(backbuffer);
-  /* !!! FIX THIS (END) !!! */
+  // !!! FIX THIS (END) !!!
 
   DrawMaskedBorder(fade_mask);
 
@@ -4146,9 +4332,9 @@ void InitGame(void)
 
   if (!game.restart_level)
   {
-    /* copy default game door content to main double buffer */
+    // copy default game door content to main double buffer
 
-    /* !!! CHECK AGAIN !!! */
+    // !!! CHECK AGAIN !!!
     SetPanelBackground();
     // SetDoorBackgroundImage(IMG_BACKGROUND_PANEL);
     DrawBackground(DX, DY, DXSIZE, DYSIZE);
@@ -4170,7 +4356,7 @@ void InitGame(void)
     MapGameButtons();
     MapTapeButtons();
 
-    /* copy actual game door content to door double buffer for OpenDoor() */
+    // copy actual game door content to door double buffer for OpenDoor()
     BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
 
     OpenDoor(DOOR_OPEN_ALL);
@@ -4196,6 +4382,7 @@ void InitGame(void)
 
   game.restart_level = FALSE;
   game.restart_game_message = NULL;
+  game.request_active = FALSE;
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     InitGameActions_MM();
@@ -4214,26 +4401,20 @@ void InitGame(void)
 void UpdateEngineValues(int actual_scroll_x, int actual_scroll_y,
                        int actual_player_x, int actual_player_y)
 {
-  /* this is used for non-R'n'D game engines to update certain engine values */
+  // this is used for non-R'n'D game engines to update certain engine values
 
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-  {
-    actual_player_x = correctLevelPosX_EM(actual_player_x);
-    actual_player_y = correctLevelPosY_EM(actual_player_y);
-  }
-
-  /* needed to determine if sounds are played within the visible screen area */
+  // needed to determine if sounds are played within the visible screen area
   scroll_x = actual_scroll_x;
   scroll_y = actual_scroll_y;
 
-  /* needed to get player position for "follow finger" playing input method */
+  // needed to get player position for "follow finger" playing input method
   local_player->jx = actual_player_x;
   local_player->jy = actual_player_y;
 }
 
 void InitMovDir(int x, int y)
 {
-  int i, element = Feld[x][y];
+  int i, element = Tile[x][y];
   static int xy[4][2] =
   {
     {  0, +1 },
@@ -4254,7 +4435,7 @@ void InitMovDir(int x, int y)
     case EL_BUG_UP:
     case EL_BUG_LEFT:
     case EL_BUG_DOWN:
-      Feld[x][y] = EL_BUG;
+      Tile[x][y] = EL_BUG;
       MovDir[x][y] = direction[0][element - EL_BUG_RIGHT];
       break;
 
@@ -4262,7 +4443,7 @@ void InitMovDir(int x, int y)
     case EL_SPACESHIP_UP:
     case EL_SPACESHIP_LEFT:
     case EL_SPACESHIP_DOWN:
-      Feld[x][y] = EL_SPACESHIP;
+      Tile[x][y] = EL_SPACESHIP;
       MovDir[x][y] = direction[0][element - EL_SPACESHIP_RIGHT];
       break;
 
@@ -4270,7 +4451,7 @@ void InitMovDir(int x, int y)
     case EL_BD_BUTTERFLY_UP:
     case EL_BD_BUTTERFLY_LEFT:
     case EL_BD_BUTTERFLY_DOWN:
-      Feld[x][y] = EL_BD_BUTTERFLY;
+      Tile[x][y] = EL_BD_BUTTERFLY;
       MovDir[x][y] = direction[0][element - EL_BD_BUTTERFLY_RIGHT];
       break;
 
@@ -4278,7 +4459,7 @@ void InitMovDir(int x, int y)
     case EL_BD_FIREFLY_UP:
     case EL_BD_FIREFLY_LEFT:
     case EL_BD_FIREFLY_DOWN:
-      Feld[x][y] = EL_BD_FIREFLY;
+      Tile[x][y] = EL_BD_FIREFLY;
       MovDir[x][y] = direction[0][element - EL_BD_FIREFLY_RIGHT];
       break;
 
@@ -4286,7 +4467,7 @@ void InitMovDir(int x, int y)
     case EL_PACMAN_UP:
     case EL_PACMAN_LEFT:
     case EL_PACMAN_DOWN:
-      Feld[x][y] = EL_PACMAN;
+      Tile[x][y] = EL_PACMAN;
       MovDir[x][y] = direction[0][element - EL_PACMAN_RIGHT];
       break;
 
@@ -4294,7 +4475,7 @@ void InitMovDir(int x, int y)
     case EL_YAMYAM_RIGHT:
     case EL_YAMYAM_UP:
     case EL_YAMYAM_DOWN:
-      Feld[x][y] = EL_YAMYAM;
+      Tile[x][y] = EL_YAMYAM;
       MovDir[x][y] = direction[2][element - EL_YAMYAM_LEFT];
       break;
 
@@ -4310,10 +4491,16 @@ void InitMovDir(int x, int y)
     case EL_MOLE_RIGHT:
     case EL_MOLE_UP:
     case EL_MOLE_DOWN:
-      Feld[x][y] = EL_MOLE;
+      Tile[x][y] = EL_MOLE;
       MovDir[x][y] = direction[2][element - EL_MOLE_LEFT];
       break;
 
+    case EL_SPRING_LEFT:
+    case EL_SPRING_RIGHT:
+      Tile[x][y] = EL_SPRING;
+      MovDir[x][y] = direction[2][element - EL_SPRING_LEFT];
+      break;
+
     default:
       if (IS_CUSTOM_ELEMENT(element))
       {
@@ -4349,7 +4536,7 @@ void InitMovDir(int x, int y)
        else if (move_pattern == MV_ALONG_LEFT_SIDE ||
                 move_pattern == MV_ALONG_RIGHT_SIDE)
        {
-         /* use random direction as default start direction */
+         // use random direction as default start direction
          if (game.engine_version >= VERSION_IDENT(3,1,0,0))
            MovDir[x][y] = 1 << RND(4);
 
@@ -4410,7 +4597,7 @@ void InitMovDir(int x, int y)
 void InitAmoebaNr(int x, int y)
 {
   int i;
-  int group_nr = AmoebeNachbarNr(x, y);
+  int group_nr = AmoebaNeighbourNr(x, y);
 
   if (group_nr == 0)
   {
@@ -4429,28 +4616,27 @@ void InitAmoebaNr(int x, int y)
   AmoebaCnt2[group_nr]++;
 }
 
-static void PlayerWins(struct PlayerInfo *player)
+static void LevelSolved(void)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_RND &&
-      local_player->players_still_needed > 0)
+      game.players_still_needed > 0)
     return;
 
-  player->LevelSolved = TRUE;
-  player->GameOver = TRUE;
+  game.LevelSolved = TRUE;
+  game.GameOver = TRUE;
 
-  player->score_final = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
-                        level.native_em_level->lev->score :
-                        level.game_engine_type == GAME_ENGINE_TYPE_MM ?
-                        game_mm.score :
-                        player->score);
-  player->health_final = (level.game_engine_type == GAME_ENGINE_TYPE_MM ?
-                         MM_HEALTH(game_mm.laser_overload_value) :
-                         player->health);
+  game.score_final = (level.game_engine_type == GAME_ENGINE_TYPE_EM ?
+                     game_em.lev->score :
+                     level.game_engine_type == GAME_ENGINE_TYPE_MM ?
+                     game_mm.score :
+                     game.score);
+  game.health_final = (level.game_engine_type == GAME_ENGINE_TYPE_MM ?
+                      MM_HEALTH(game_mm.laser_overload_value) :
+                      game.health);
 
-  player->LevelSolved_CountingTime = (game.no_time_limit ? TimePlayed :
-                                     TimeLeft);
-  player->LevelSolved_CountingScore = player->score_final;
-  player->LevelSolved_CountingHealth = player->health_final;
+  game.LevelSolved_CountingTime = (game.no_time_limit ? TimePlayed : TimeLeft);
+  game.LevelSolved_CountingScore = game.score_final;
+  game.LevelSolved_CountingHealth = game.health_final;
 }
 
 void GameWon(void)
@@ -4466,17 +4652,17 @@ void GameWon(void)
   int game_over_delay_value_2 = 25;
   int game_over_delay_value_3 = 50;
 
-  if (!local_player->LevelSolved_GameWon)
+  if (!game.LevelSolved_GameWon)
   {
     int i;
 
-    /* do not start end game actions before the player stops moving (to exit) */
-    if (local_player->MovPos)
+    // do not start end game actions before the player stops moving (to exit)
+    if (local_player->active && local_player->MovPos)
       return;
 
-    local_player->LevelSolved_GameWon = TRUE;
-    local_player->LevelSolved_SaveTape = tape.recording;
-    local_player->LevelSolved_SaveScore = !tape.playing;
+    game.LevelSolved_GameWon = TRUE;
+    game.LevelSolved_SaveTape = tape.recording;
+    game.LevelSolved_SaveScore = !tape.playing;
 
     if (!tape.playing)
     {
@@ -4485,7 +4671,7 @@ void GameWon(void)
       SaveLevelSetup_SeriesInfo();
     }
 
-    if (tape.auto_play)                /* tape might already be stopped here */
+    if (tape.auto_play)                // tape might already be stopped here
       tape.auto_play_level_solved = TRUE;
 
     TapeStop();
@@ -4495,8 +4681,8 @@ void GameWon(void)
     game_over_delay_3 = game_over_delay_value_3;
 
     time = time_final = (game.no_time_limit ? TimePlayed : TimeLeft);
-    score = score_final = local_player->score_final;
-    health = health_final = local_player->health_final;
+    score = score_final = game.score_final;
+    health = health_final = game.health_final;
 
     if (level.score[SC_TIME_BONUS] > 0)
     {
@@ -4523,8 +4709,8 @@ void GameWon(void)
        game_over_delay_2 = game_over_delay_value_2;
       }
 
-      local_player->score_final = score_final;
-      local_player->health_final = health_final;
+      game.score_final = score_final;
+      game.health_final = health_final;
     }
 
     if (level_editor_test_game)
@@ -4532,8 +4718,8 @@ void GameWon(void)
       time = time_final;
       score = score_final;
 
-      local_player->LevelSolved_CountingTime = time;
-      local_player->LevelSolved_CountingScore = score;
+      game.LevelSolved_CountingTime = time;
+      game.LevelSolved_CountingScore = score;
 
       game_panel_controls[GAME_PANEL_TIME].value = time;
       game_panel_controls[GAME_PANEL_SCORE].value = score;
@@ -4543,30 +4729,35 @@ void GameWon(void)
 
     if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
     {
-      if (ExitX >= 0 && ExitY >= 0)    /* local player has left the level */
+      // check if last player has left the level
+      if (game.exit_x >= 0 &&
+         game.exit_y >= 0)
       {
-       /* close exit door after last player */
-       if ((AllPlayersGone &&
-            (Feld[ExitX][ExitY] == EL_EXIT_OPEN ||
-             Feld[ExitX][ExitY] == EL_SP_EXIT_OPEN ||
-             Feld[ExitX][ExitY] == EL_STEEL_EXIT_OPEN)) ||
-           Feld[ExitX][ExitY] == EL_EM_EXIT_OPEN ||
-           Feld[ExitX][ExitY] == EL_EM_STEEL_EXIT_OPEN)
+       int x = game.exit_x;
+       int y = game.exit_y;
+       int element = Tile[x][y];
+
+       // close exit door after last player
+       if ((game.all_players_gone &&
+            (element == EL_EXIT_OPEN ||
+             element == EL_SP_EXIT_OPEN ||
+             element == EL_STEEL_EXIT_OPEN)) ||
+           element == EL_EM_EXIT_OPEN ||
+           element == EL_EM_STEEL_EXIT_OPEN)
        {
-         int element = Feld[ExitX][ExitY];
 
-         Feld[ExitX][ExitY] =
+         Tile[x][y] =
            (element == EL_EXIT_OPEN            ? EL_EXIT_CLOSING :
             element == EL_EM_EXIT_OPEN         ? EL_EM_EXIT_CLOSING :
             element == EL_SP_EXIT_OPEN         ? EL_SP_EXIT_CLOSING:
             element == EL_STEEL_EXIT_OPEN      ? EL_STEEL_EXIT_CLOSING:
             EL_EM_STEEL_EXIT_CLOSING);
 
-         PlayLevelSoundElementAction(ExitX, ExitY, element, ACTION_CLOSING);
+         PlayLevelSoundElementAction(x, y, element, ACTION_CLOSING);
        }
 
-       /* player disappears */
-       DrawLevelField(ExitX, ExitY);
+       // player disappears
+       DrawLevelField(x, y);
       }
 
       for (i = 0; i < MAX_PLAYERS; i++)
@@ -4577,7 +4768,7 @@ void GameWon(void)
        {
          RemovePlayer(player);
 
-         /* player disappears */
+         // player disappears
          DrawLevelField(player->jx, player->jy);
        }
       }
@@ -4604,8 +4795,8 @@ void GameWon(void)
     time  += time_count_steps * time_count_dir;
     score += time_count_steps * level.score[SC_TIME_BONUS];
 
-    local_player->LevelSolved_CountingTime = time;
-    local_player->LevelSolved_CountingScore = score;
+    game.LevelSolved_CountingTime = time;
+    game.LevelSolved_CountingScore = score;
 
     game_panel_controls[GAME_PANEL_TIME].value = time;
     game_panel_controls[GAME_PANEL_SCORE].value = score;
@@ -4636,8 +4827,8 @@ void GameWon(void)
     health += health_count_dir;
     score  += level.score[SC_TIME_BONUS];
 
-    local_player->LevelSolved_CountingHealth = health;
-    local_player->LevelSolved_CountingScore = score;
+    game.LevelSolved_CountingHealth = health;
+    game.LevelSolved_CountingScore = score;
 
     game_panel_controls[GAME_PANEL_HEALTH].value = health;
     game_panel_controls[GAME_PANEL_SCORE].value = score;
@@ -4668,22 +4859,22 @@ void GameWon(void)
 
 void GameEnd(void)
 {
-  /* used instead of "level_nr" (needed for network games) */
+  // used instead of "level_nr" (needed for network games)
   int last_level_nr = levelset.level_nr;
   int hi_pos;
 
-  local_player->LevelSolved_GameEnd = TRUE;
+  game.LevelSolved_GameEnd = TRUE;
 
-  if (local_player->LevelSolved_SaveTape)
+  if (game.LevelSolved_SaveTape)
   {
-    /* make sure that request dialog to save tape does not open door again */
+    // make sure that request dialog to save tape does not open door again
     if (!global.use_envelope_request)
       CloseDoor(DOOR_CLOSE_1);
 
-    SaveTapeChecked_LevelSolved(tape.level_nr);                /* ask to save tape */
+    SaveTapeChecked_LevelSolved(tape.level_nr);                // ask to save tape
   }
 
-  /* if no tape is to be saved, close both doors simultaneously */
+  // if no tape is to be saved, close both doors simultaneously
   CloseDoor(DOOR_CLOSE_ALL);
 
   if (level_editor_test_game)
@@ -4695,7 +4886,7 @@ void GameEnd(void)
     return;
   }
 
-  if (!local_player->LevelSolved_SaveScore)
+  if (!game.LevelSolved_SaveScore)
   {
     SetGameStatus(GAME_MODE_MAIN);
 
@@ -4715,8 +4906,8 @@ void GameEnd(void)
       level_nr < leveldir_current->last_level &&
       !network_playing)
   {
-    level_nr++;                /* advance to next level */
-    TapeErase();       /* start with empty tape */
+    level_nr++;                // advance to next level
+    TapeErase();       // start with empty tape
 
     if (setup.auto_play_next_level)
     {
@@ -4757,14 +4948,14 @@ int NewHiScore(int level_nr)
   LoadScore(level_nr);
 
   if (strEqual(setup.player_name, EMPTY_PLAYER_NAME) ||
-      local_player->score_final < highscore[MAX_SCORE_ENTRIES - 1].Score) 
+      game.score_final < highscore[MAX_SCORE_ENTRIES - 1].Score)
     return -1;
 
-  for (k = 0; k < MAX_SCORE_ENTRIES; k++) 
+  for (k = 0; k < MAX_SCORE_ENTRIES; k++)
   {
-    if (local_player->score_final > highscore[k].Score)
+    if (game.score_final > highscore[k].Score)
     {
-      /* player has made it to the hall of fame */
+      // player has made it to the hall of fame
 
       if (k < MAX_SCORE_ENTRIES - 1)
       {
@@ -4776,7 +4967,7 @@ int NewHiScore(int level_nr)
            if (strEqual(setup.player_name, highscore[l].Name))
              m = l;
 
-         if (m == k)   /* player's new highscore overwrites his old one */
+         if (m == k)   // player's new highscore overwrites his old one
            goto put_into_list;
        }
 
@@ -4791,7 +4982,7 @@ int NewHiScore(int level_nr)
 
       strncpy(highscore[k].Name, setup.player_name, MAX_PLAYER_NAME_LEN);
       highscore[k].Name[MAX_PLAYER_NAME_LEN] = '\0';
-      highscore[k].Score = local_player->score_final; 
+      highscore[k].Score = game.score_final;
       position = k;
 
       break;
@@ -4799,7 +4990,7 @@ int NewHiScore(int level_nr)
     else if (one_score_entry_per_name &&
             !strncmp(setup.player_name, highscore[k].Name,
                      MAX_PLAYER_NAME_LEN))
-      break;   /* player already there with a higher score */
+      break;   // player already there with a higher score
   }
 
   if (position >= 0) 
@@ -4808,20 +4999,20 @@ int NewHiScore(int level_nr)
   return position;
 }
 
-inline static int getElementMoveStepsizeExt(int x, int y, int direction)
+static int getElementMoveStepsizeExt(int x, int y, int direction)
 {
-  int element = Feld[x][y];
+  int element = Tile[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 sign = (horiz_move ? dx : dy);
   int step = sign * element_info[element].move_stepsize;
 
-  /* special values for move stepsize for spring and things on conveyor belt */
+  // special values for move stepsize for spring and things on conveyor belt
   if (horiz_move)
   {
     if (CAN_FALL(element) &&
-       y < lev_fieldy - 1 && IS_BELT_ACTIVE(Feld[x][y + 1]))
+       y < lev_fieldy - 1 && IS_BELT_ACTIVE(Tile[x][y + 1]))
       step = sign * MOVE_STEPSIZE_NORMAL / 2;
     else if (element == EL_SPRING)
       step = sign * MOVE_STEPSIZE_NORMAL * 2;
@@ -4830,7 +5021,7 @@ inline static int getElementMoveStepsizeExt(int x, int y, int direction)
   return step;
 }
 
-inline static int getElementMoveStepsize(int x, int y)
+static int getElementMoveStepsize(int x, int y)
 {
   return getElementMoveStepsizeExt(x, y, MovDir[x][y]);
 }
@@ -4852,7 +5043,7 @@ static void ResetGfxFrame(int x, int y)
   if (DrawingDeactivatedField())
     return;
 
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
 
   if (graphic_info[graphic].anim_global_sync)
@@ -4881,20 +5072,20 @@ static void ResetRandomAnimationValue(int x, int y)
 
 static void InitMovingField(int x, int y, int direction)
 {
-  int element = Feld[x][y];
+  int element = Tile[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 newx = x + dx;
   int newy = y + dy;
   boolean is_moving_before, is_moving_after;
 
-  /* check if element was/is moving or being moved before/after mode change */
+  // check if element was/is moving or being moved before/after mode change
   is_moving_before = (WasJustMoving[x][y] != 0);
   is_moving_after  = (getElementMoveStepsizeExt(x, y, direction)    != 0);
 
-  /* reset animation only for moving elements which change direction of moving
-     or which just started or stopped moving
-     (else CEs with property "can move" / "not moving" are reset each frame) */
+  // reset animation only for moving elements which change direction of moving
+  // or which just started or stopped moving
+  // (else CEs with property "can move" / "not moving" are reset each frame)
   if (is_moving_before != is_moving_after ||
       direction != MovDir[x][y])
     ResetGfxAnimation(x, y);
@@ -4906,12 +5097,12 @@ static void InitMovingField(int x, int y, int direction)
                     direction == MV_DOWN && CAN_FALL(element) ?
                     ACTION_FALLING : ACTION_MOVING);
 
-  /* this is needed for CEs with property "can move" / "not moving" */
+  // this is needed for CEs with property "can move" / "not moving"
 
   if (is_moving_after)
   {
-    if (Feld[newx][newy] == EL_EMPTY)
-      Feld[newx][newy] = EL_BLOCKED;
+    if (Tile[newx][newy] == EL_EMPTY)
+      Tile[newx][newy] = EL_BLOCKED;
 
     MovDir[newx][newy] = MovDir[x][y];
 
@@ -4954,14 +5145,14 @@ void Blocked2Moving(int x, int y, int *comes_from_x, int *comes_from_y)
 
 static int MovingOrBlocked2Element(int x, int y)
 {
-  int element = Feld[x][y];
+  int element = Tile[x][y];
 
   if (element == EL_BLOCKED)
   {
     int oldx, oldy;
 
     Blocked2Moving(x, y, &oldx, &oldy);
-    return Feld[oldx][oldy];
+    return Tile[oldx][oldy];
   }
   else
     return element;
@@ -4969,10 +5160,10 @@ static int MovingOrBlocked2Element(int x, int y)
 
 static int MovingOrBlocked2ElementIfNotLeaving(int x, int y)
 {
-  /* like MovingOrBlocked2Element(), but if element is moving
-     and (x,y) is the field the moving element is just leaving,
-     return EL_BLOCKED instead of the element value */
-  int element = Feld[x][y];
+  // like MovingOrBlocked2Element(), but if element is moving
+  // and (x,y) is the field the moving element is just leaving,
+  // return EL_BLOCKED instead of the element value
+  int element = Tile[x][y];
 
   if (IS_MOVING(x, y))
   {
@@ -4981,7 +5172,7 @@ static int MovingOrBlocked2ElementIfNotLeaving(int x, int y)
       int oldx, oldy;
 
       Blocked2Moving(x, y, &oldx, &oldy);
-      return Feld[oldx][oldy];
+      return Tile[oldx][oldy];
     }
     else
       return EL_BLOCKED;
@@ -4992,7 +5183,7 @@ static int MovingOrBlocked2ElementIfNotLeaving(int x, int y)
 
 static void RemoveField(int x, int y)
 {
-  Feld[x][y] = EL_EMPTY;
+  Tile[x][y] = EL_EMPTY;
 
   MovPos[x][y] = 0;
   MovDir[x][y] = 0;
@@ -5013,7 +5204,7 @@ static void RemoveField(int x, int y)
 static void RemoveMovingField(int x, int y)
 {
   int oldx = x, oldy = y, newx = x, newy = y;
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   int next_element = EL_UNDEFINED;
 
   if (element != EL_BLOCKED && !IS_MOVING(x, y))
@@ -5023,11 +5214,11 @@ static void RemoveMovingField(int x, int y)
   {
     Moving2Blocked(x, y, &newx, &newy);
 
-    if (Feld[newx][newy] != EL_BLOCKED)
+    if (Tile[newx][newy] != EL_BLOCKED)
     {
-      /* element is moving, but target field is not free (blocked), but
-        already occupied by something different (example: acid pool);
-        in this case, only remove the moving field, but not the target */
+      // element is moving, but target field is not free (blocked), but
+      // already occupied by something different (example: acid pool);
+      // in this case, only remove the moving field, but not the target
 
       RemoveField(oldx, oldy);
 
@@ -5046,13 +5237,13 @@ static void RemoveMovingField(int x, int y)
   }
 
   if (element == EL_BLOCKED &&
-      (Feld[oldx][oldy] == EL_QUICKSAND_EMPTYING ||
-       Feld[oldx][oldy] == EL_QUICKSAND_FAST_EMPTYING ||
-       Feld[oldx][oldy] == EL_MAGIC_WALL_EMPTYING ||
-       Feld[oldx][oldy] == EL_BD_MAGIC_WALL_EMPTYING ||
-       Feld[oldx][oldy] == EL_DC_MAGIC_WALL_EMPTYING ||
-       Feld[oldx][oldy] == EL_AMOEBA_DROPPING))
-    next_element = get_next_element(Feld[oldx][oldy]);
+      (Tile[oldx][oldy] == EL_QUICKSAND_EMPTYING ||
+       Tile[oldx][oldy] == EL_QUICKSAND_FAST_EMPTYING ||
+       Tile[oldx][oldy] == EL_MAGIC_WALL_EMPTYING ||
+       Tile[oldx][oldy] == EL_BD_MAGIC_WALL_EMPTYING ||
+       Tile[oldx][oldy] == EL_DC_MAGIC_WALL_EMPTYING ||
+       Tile[oldx][oldy] == EL_AMOEBA_DROPPING))
+    next_element = get_next_element(Tile[oldx][oldy]);
 
   RemoveField(oldx, oldy);
   RemoveField(newx, newy);
@@ -5060,7 +5251,7 @@ static void RemoveMovingField(int x, int y)
   Store[oldx][oldy] = Store2[oldx][oldy] = 0;
 
   if (next_element != EL_UNDEFINED)
-    Feld[oldx][oldy] = next_element;
+    Tile[oldx][oldy] = next_element;
 
   TEST_DrawLevelField(oldx, oldy);
   TEST_DrawLevelField(newx, newy);
@@ -5069,7 +5260,7 @@ static void RemoveMovingField(int x, int y)
 void DrawDynamite(int x, int y)
 {
   int sx = SCREENX(x), sy = SCREENY(y);
-  int graphic = el2img(Feld[x][y]);
+  int graphic = el2img(Tile[x][y]);
   int frame;
 
   if (!IN_SCR_FIELD(sx, sy) || IS_PLAYER(x, y))
@@ -5093,7 +5284,7 @@ void DrawDynamite(int x, int y)
 
 static void CheckDynamite(int x, int y)
 {
-  if (MovDelay[x][y] != 0)     /* dynamite is still waiting to explode */
+  if (MovDelay[x][y] != 0)     // dynamite is still waiting to explode
   {
     MovDelay[x][y]--;
 
@@ -5173,7 +5364,7 @@ static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
 
   if (level.lazy_relocation && IN_VIS_FIELD(SCREENX(x), SCREENY(y)))
   {
-    /* case 1: quick relocation inside visible screen (without scrolling) */
+    // case 1: quick relocation inside visible screen (without scrolling)
 
     RedrawPlayfield();
 
@@ -5182,28 +5373,28 @@ static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
 
   if (!level.shifted_relocation || center_screen)
   {
-    /* relocation _with_ centering of screen */
+    // relocation _with_ centering of screen
 
     new_scroll_x = SCROLL_POSITION_X(x);
     new_scroll_y = SCROLL_POSITION_Y(y);
   }
   else
   {
-    /* relocation _without_ centering of screen */
+    // relocation _without_ centering of screen
 
     int center_scroll_x = SCROLL_POSITION_X(old_x);
     int center_scroll_y = SCROLL_POSITION_Y(old_y);
     int offset_x = x + (scroll_x - center_scroll_x);
     int offset_y = y + (scroll_y - center_scroll_y);
 
-    /* for new screen position, apply previous offset to center position */
+    // for new screen position, apply previous offset to center position
     new_scroll_x = SCROLL_POSITION_X(offset_x);
     new_scroll_y = SCROLL_POSITION_Y(offset_y);
   }
 
   if (quick_relocation)
   {
-    /* case 2: quick relocation (redraw without visible scrolling) */
+    // case 2: quick relocation (redraw without visible scrolling)
 
     scroll_x = new_scroll_x;
     scroll_y = new_scroll_y;
@@ -5213,36 +5404,38 @@ static void DrawRelocateScreen(int old_x, int old_y, int x, int y, int move_dir,
     return;
   }
 
-  /* case 3: visible relocation (with scrolling to new position) */
+  // case 3: visible relocation (with scrolling to new position)
 
-  ScrollScreen(NULL, SCROLL_GO_ON);    /* scroll last frame to full tile */
+  ScrollScreen(NULL, SCROLL_GO_ON);    // scroll last frame to full tile
 
   SetVideoFrameDelay(wait_delay_value);
 
   while (scroll_x != new_scroll_x || scroll_y != new_scroll_y)
   {
-    int dx = 0, dy = 0;
-    int fx = FX, fy = FY;
+    int dx = (new_scroll_x < scroll_x ? +1 : new_scroll_x > scroll_x ? -1 : 0);
+    int dy = (new_scroll_y < scroll_y ? +1 : new_scroll_y > scroll_y ? -1 : 0);
 
-    dx = (new_scroll_x < scroll_x ? +1 : new_scroll_x > scroll_x ? -1 : 0);
-    dy = (new_scroll_y < scroll_y ? +1 : new_scroll_y > scroll_y ? -1 : 0);
-
-    if (dx == 0 && dy == 0)            /* no scrolling needed at all */
+    if (dx == 0 && dy == 0)            // no scrolling needed at all
       break;
 
     scroll_x -= dx;
     scroll_y -= dy;
 
-    fx += dx * TILEX / 2;
-    fy += dy * TILEY / 2;
+    // set values for horizontal/vertical screen scrolling (half tile size)
+    int dir_x = (dx != 0 ? MV_HORIZONTAL : 0);
+    int dir_y = (dy != 0 ? MV_VERTICAL   : 0);
+    int pos_x = dx * TILEX / 2;
+    int pos_y = dy * TILEY / 2;
+    int fx = getFieldbufferOffsetX_RND(dir_x, pos_x);
+    int fy = getFieldbufferOffsetY_RND(dir_y, pos_y);
 
     ScrollLevel(dx, dy);
     DrawAllPlayers();
 
-    /* scroll in two steps of half tile size to make things smoother */
-    BlitBitmap(drawto_field, window, fx, fy, SXSIZE, SYSIZE, SX, SY);
+    // scroll in two steps of half tile size to make things smoother
+    BlitScreenToBitmapExt_RND(window, fx, fy);
 
-    /* scroll second step to align at full tile size */
+    // scroll second step to align at full tile size
     BlitScreenToBitmap(window);
   }
 
@@ -5263,8 +5456,8 @@ static void RelocatePlayer(int jx, int jy, int el_player_raw)
   int wait_delay_value = (no_delay ? 0 : frame_delay_value);
   int old_jx = player->jx;
   int old_jy = player->jy;
-  int old_element = Feld[old_jx][old_jy];
-  int element = Feld[jx][jy];
+  int old_element = Tile[old_jx][old_jy];
+  int element = Tile[jx][jy];
   boolean player_relocated = (old_jx != jx || old_jy != jy);
 
   int move_dir_horiz = (jx < old_jx ? MV_LEFT : jx > old_jx ? MV_RIGHT : 0);
@@ -5276,15 +5469,15 @@ static void RelocatePlayer(int jx, int jy, int el_player_raw)
   int enter_side = enter_side_horiz | enter_side_vert;
   int leave_side = leave_side_horiz | leave_side_vert;
 
-  if (player->GameOver)                /* do not reanimate dead player */
+  if (player->buried)          // do not reanimate dead player
     return;
 
-  if (!player_relocated)       /* no need to relocate the player */
+  if (!player_relocated)       // no need to relocate the player
     return;
 
-  if (IS_PLAYER(jx, jy))       /* player already placed at new position */
+  if (IS_PLAYER(jx, jy))       // player already placed at new position
   {
-    RemoveField(jx, jy);       /* temporarily remove newly placed player */
+    RemoveField(jx, jy);       // temporarily remove newly placed player
     DrawLevelField(jx, jy);
   }
 
@@ -5302,8 +5495,8 @@ static void RelocatePlayer(int jx, int jy, int el_player_raw)
       BackToFront_WithFrameDelay(wait_delay_value);
     }
 
-    DrawPlayer(player);                /* needed here only to cleanup last field */
-    DrawLevelField(player->jx, player->jy);    /* remove player graphic */
+    DrawPlayer(player);                // needed here only to cleanup last field
+    DrawLevelField(player->jx, player->jy);    // remove player graphic
 
     player->is_moving = FALSE;
   }
@@ -5317,19 +5510,19 @@ static void RelocatePlayer(int jx, int jy, int el_player_raw)
                                      CE_PLAYER_LEAVES_X,
                                      player->index_bit, leave_side);
 
-  Feld[jx][jy] = el_player;
+  Tile[jx][jy] = el_player;
   InitPlayerField(jx, jy, el_player, TRUE);
 
-  /* "InitPlayerField()" above sets Feld[jx][jy] to EL_EMPTY, but it may be
+  /* "InitPlayerField()" above sets Tile[jx][jy] to EL_EMPTY, but it may be
      possible that the relocation target field did not contain a player element,
      but a walkable element, to which the new player was relocated -- in this
      case, restore that (already initialized!) element on the player field */
-  if (!ELEM_IS_PLAYER(element))        /* player may be set on walkable element */
+  if (!ELEM_IS_PLAYER(element))        // player may be set on walkable element
   {
-    Feld[jx][jy] = element;    /* restore previously existing element */
+    Tile[jx][jy] = element;    // restore previously existing element
   }
 
-  /* only visually relocate centered player */
+  // only visually relocate centered player
   DrawRelocateScreen(old_jx, old_jy, player->jx, player->jy, player->MovDir,
                     FALSE, level.instant_relocation);
 
@@ -5363,7 +5556,7 @@ static void Explode(int ex, int ey, int phase, int mode)
   int last_phase;
   int border_element;
 
-  /* !!! eliminate this variable !!! */
+  // !!! eliminate this variable !!!
   int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
 
   if (game.explosions_delayed)
@@ -5372,26 +5565,26 @@ static void Explode(int ex, int ey, int phase, int mode)
     return;
   }
 
-  if (phase == EX_PHASE_START)         /* initialize 'Store[][]' field */
+  if (phase == EX_PHASE_START)         // initialize 'Store[][]' field
   {
-    int center_element = Feld[ex][ey];
-    int artwork_element, explosion_element;    /* set these values later */
+    int center_element = Tile[ex][ey];
+    int artwork_element, explosion_element;    // set these values later
 
-    /* remove things displayed in background while burning dynamite */
+    // remove things displayed in background while burning dynamite
     if (Back[ex][ey] != EL_EMPTY && !IS_INDESTRUCTIBLE(Back[ex][ey]))
       Back[ex][ey] = 0;
 
     if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey))
     {
-      /* put moving element to center field (and let it explode there) */
+      // put moving element to center field (and let it explode there)
       center_element = MovingOrBlocked2Element(ex, ey);
       RemoveMovingField(ex, ey);
-      Feld[ex][ey] = center_element;
+      Tile[ex][ey] = center_element;
     }
 
-    /* now "center_element" is finally determined -- set related values now */
-    artwork_element = center_element;          /* for custom player artwork */
-    explosion_element = center_element;                /* for custom player artwork */
+    // now "center_element" is finally determined -- set related values now
+    artwork_element = center_element;          // for custom player artwork
+    explosion_element = center_element;                // for custom player artwork
 
     if (IS_PLAYER(ex, ey))
     {
@@ -5424,7 +5617,7 @@ static void Explode(int ex, int ey, int phase, int mode)
          (mode == EX_TYPE_CROSS      && (x != ex && y != ey)))
        continue;
 
-      element = Feld[x][y];
+      element = Tile[x][y];
 
       if (IS_MOVING(x, y) || IS_BLOCKED(x, y))
       {
@@ -5434,7 +5627,7 @@ static void Explode(int ex, int ey, int phase, int mode)
          RemoveMovingField(x, y);
       }
 
-      /* indestructible elements can only explode in center (but not flames) */
+      // indestructible elements can only explode in center (but not flames)
       if ((IS_EXPLOSION_PROOF(element) && (x != ex || y != ey ||
                                           mode == EX_TYPE_BORDER)) ||
          element == EL_FLAMES)
@@ -5443,7 +5636,7 @@ static void Explode(int ex, int ey, int phase, int mode)
       /* no idea why this was changed from 3.0.8 to 3.1.0 -- this causes buggy
         behaviour, for example when touching a yamyam that explodes to rocks
         with active deadly shield, a rock is created under the player !!! */
-      /* (case 1 (surely buggy): >= 3.1.0, case 2 (maybe buggy): <= 3.0.8) */
+      // (case 1 (surely buggy): >= 3.1.0, case 2 (maybe buggy): <= 3.0.8)
 #if 0
       if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)) &&
          (game.engine_version < VERSION_IDENT(3,1,0,0) ||
@@ -5454,20 +5647,20 @@ static void Explode(int ex, int ey, int phase, int mode)
       {
        if (IS_ACTIVE_BOMB(element))
        {
-         /* re-activate things under the bomb like gate or penguin */
-         Feld[x][y] = (Back[x][y] ? Back[x][y] : EL_EMPTY);
+         // re-activate things under the bomb like gate or penguin
+         Tile[x][y] = (Back[x][y] ? Back[x][y] : EL_EMPTY);
          Back[x][y] = 0;
        }
 
        continue;
       }
 
-      /* save walkable background elements while explosion on same tile */
+      // save walkable background elements while explosion on same tile
       if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element) &&
          (x != ex || y != ey || mode == EX_TYPE_BORDER))
        Back[x][y] = element;
 
-      /* ignite explodable elements reached by other explosion */
+      // ignite explodable elements reached by other explosion
       if (element == EL_EXPLOSION)
        element = Store2[x][y];
 
@@ -5492,8 +5685,8 @@ static void Explode(int ex, int ey, int phase, int mode)
          Store[x][y] = EL_EMPTY;
       }
 
-      /* !!! check this case -- currently needed for rnd_rado_negundo_v,
-        !!! levels 015 018 019 020 021 022 023 026 027 028 !!! */
+      // !!! check this case -- currently needed for rnd_rado_negundo_v,
+      // !!! levels 015 018 019 020 021 022 023 026 027 028 !!!
       else if (ELEM_IS_PLAYER(center_element))
        Store[x][y] = EL_EMPTY;
       else if (center_element == EL_YAMYAM)
@@ -5501,9 +5694,9 @@ static void Explode(int ex, int ey, int phase, int mode)
       else if (element_info[center_element].content.e[xx][yy] != EL_EMPTY)
        Store[x][y] = element_info[center_element].content.e[xx][yy];
 #if 1
-      /* needed because EL_BD_BUTTERFLY is not defined as "CAN_EXPLODE"
-        (killing EL_BD_BUTTERFLY with dynamite would result in BD diamond
-        otherwise) -- FIX THIS !!! */
+      // needed because EL_BD_BUTTERFLY is not defined as "CAN_EXPLODE"
+      // (killing EL_BD_BUTTERFLY with dynamite would result in BD diamond
+      // otherwise) -- FIX THIS !!!
       else if (!CAN_EXPLODE(element) && element != EL_BD_BUTTERFLY)
        Store[x][y] = element_info[element].content.e[1][1];
 #else
@@ -5517,7 +5710,7 @@ static void Explode(int ex, int ey, int phase, int mode)
          center_element == EL_AMOEBA_TO_DIAMOND)
        Store2[x][y] = element;
 
-      Feld[x][y] = EL_EXPLOSION;
+      Tile[x][y] = EL_EXPLOSION;
       GfxElement[x][y] = artwork_element;
 
       ExplodePhase[x][y] = 1;
@@ -5540,13 +5733,13 @@ static void Explode(int ex, int ey, int phase, int mode)
   y = ey;
 
   if (phase == 1)
-    GfxFrame[x][y] = 0;                /* restart explosion animation */
+    GfxFrame[x][y] = 0;                // restart explosion animation
 
   last_phase = ExplodeDelay[x][y];
 
   ExplodePhase[x][y] = (phase < last_phase ? phase + 1 : 0);
 
-  /* this can happen if the player leaves an explosion just in time */
+  // this can happen if the player leaves an explosion just in time
   if (GfxElement[x][y] == EL_UNDEFINED)
     GfxElement[x][y] = EL_EMPTY;
 
@@ -5567,21 +5760,21 @@ static void Explode(int ex, int ey, int phase, int mode)
     }
     else if (CAN_EXPLODE_BY_EXPLOSION(border_element))
     {
-      Feld[x][y] = Store2[x][y];
+      Tile[x][y] = Store2[x][y];
       Store2[x][y] = 0;
       Bang(x, y);
       border_explosion = TRUE;
     }
     else if (border_element == EL_AMOEBA_TO_DIAMOND)
     {
-      AmoebeUmwandeln(x, y);
+      AmoebaToDiamond(x, y);
       Store2[x][y] = 0;
       border_explosion = TRUE;
     }
 
-    /* if an element just explodes due to another explosion (chain-reaction),
-       do not immediately end the new explosion when it was the last frame of
-       the explosion (as it would be done in the following "if"-statement!) */
+    // if an element just explodes due to another explosion (chain-reaction),
+    // do not immediately end the new explosion when it was the last frame of
+    // the explosion (as it would be done in the following "if"-statement!)
     if (border_explosion && phase == last_phase)
       return;
   }
@@ -5590,11 +5783,11 @@ static void Explode(int ex, int ey, int phase, int mode)
   {
     int element;
 
-    element = Feld[x][y] = Store[x][y];
+    element = Tile[x][y] = Store[x][y];
     Store[x][y] = Store2[x][y] = 0;
     GfxElement[x][y] = EL_UNDEFINED;
 
-    /* player can escape from explosions and might therefore be still alive */
+    // player can escape from explosions and might therefore be still alive
     if (element >= EL_PLAYER_IS_EXPLODING_1 &&
        element <= EL_PLAYER_IS_EXPLODING_4)
     {
@@ -5606,13 +5799,13 @@ static void Explode(int ex, int ey, int phase, int mode)
       if (level.use_explosion_element[player_nr])
        explosion_element = level.explosion_element[player_nr];
 
-      Feld[x][y] = (stored_player[player_nr].active ? EL_EMPTY :
+      Tile[x][y] = (stored_player[player_nr].active ? EL_EMPTY :
                    element_info[explosion_element].content.e[xx][yy]);
     }
 
-    /* restore probably existing indestructible background element */
+    // restore probably existing indestructible background element
     if (Back[x][y] && IS_INDESTRUCTIBLE(Back[x][y]))
-      element = Feld[x][y] = Back[x][y];
+      element = Tile[x][y] = Back[x][y];
     Back[x][y] = 0;
 
     MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = 0;
@@ -5663,7 +5856,7 @@ static void Explode(int ex, int ey, int phase, int mode)
 static void DynaExplode(int ex, int ey)
 {
   int i, j;
-  int dynabomb_element = Feld[ex][ey];
+  int dynabomb_element = Tile[ex][ey];
   int dynabomb_size = 1;
   boolean dynabomb_xl = FALSE;
   struct PlayerInfo *player;
@@ -5693,12 +5886,12 @@ static void DynaExplode(int ex, int ey)
       int y = ey + j * xy[i][1];
       int element;
 
-      if (!IN_LEV_FIELD(x, y) || IS_INDESTRUCTIBLE(Feld[x][y]))
+      if (!IN_LEV_FIELD(x, y) || IS_INDESTRUCTIBLE(Tile[x][y]))
        break;
 
-      element = Feld[x][y];
+      element = Tile[x][y];
 
-      /* do not restart explosions of fields with active bombs */
+      // do not restart explosions of fields with active bombs
       if (element == EL_EXPLOSION && IS_ACTIVE_BOMB(Store2[x][y]))
        continue;
 
@@ -5720,7 +5913,7 @@ void Bang(int x, int y)
   {
     struct PlayerInfo *player = PLAYERINFO(x, y);
 
-    element = Feld[x][y] = player->initial_element;
+    element = Tile[x][y] = player->initial_element;
 
     if (level.use_explosion_element[player->index_nr])
     {
@@ -5765,7 +5958,7 @@ void Bang(int x, int y)
     case EL_LAMP:
     case EL_LAMP_ACTIVE:
     case EL_AMOEBA_TO_DIAMOND:
-      if (!IS_PLAYER(x, y))    /* penguin and player may be at same field */
+      if (!IS_PLAYER(x, y))    // penguin and player may be at same field
        explosion_type = EX_TYPE_CENTER;
       break;
 
@@ -5790,12 +5983,12 @@ static void SplashAcid(int x, int y)
   if (IN_LEV_FIELD(x - 1, y - 1) && IS_FREE(x - 1, y - 1) &&
       (!IN_LEV_FIELD(x - 1, y - 2) ||
        !CAN_FALL(MovingOrBlocked2Element(x - 1, y - 2))))
-    Feld[x - 1][y - 1] = EL_ACID_SPLASH_LEFT;
+    Tile[x - 1][y - 1] = EL_ACID_SPLASH_LEFT;
 
   if (IN_LEV_FIELD(x + 1, y - 1) && IS_FREE(x + 1, y - 1) &&
       (!IN_LEV_FIELD(x + 1, y - 2) ||
        !CAN_FALL(MovingOrBlocked2Element(x + 1, y - 2))))
-    Feld[x + 1][y - 1] = EL_ACID_SPLASH_RIGHT;
+    Tile[x + 1][y - 1] = EL_ACID_SPLASH_RIGHT;
 
   PlayLevelSound(x, y, SND_ACID_SPLASHING);
 }
@@ -5819,7 +6012,7 @@ static void InitBeltMovement(void)
 
   int x, y, i, j;
 
-  /* set frame order for belt animation graphic according to belt direction */
+  // set frame order for belt animation graphic according to belt direction
   for (i = 0; i < NUM_BELTS; i++)
   {
     int belt_nr = i;
@@ -5845,7 +6038,7 @@ static void InitBeltMovement(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
 
     for (i = 0; i < NUM_BELTS; i++)
     {
@@ -5856,9 +6049,9 @@ static void InitBeltMovement(void)
 
        if (e_belt_nr == belt_nr)
        {
-         int belt_part = Feld[x][y] - belt_base_element[belt_nr];
+         int belt_part = Tile[x][y] - belt_base_element[belt_nr];
 
-         Feld[x][y] = belt_base_active_element[belt_nr] + belt_part;
+         Tile[x][y] = belt_base_active_element[belt_nr] + belt_part;
        }
       }
     }
@@ -5896,7 +6089,7 @@ static void ToggleBeltSwitch(int x, int y)
     MV_NONE,
   };
 
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   int belt_nr = getBeltNrFromBeltSwitchElement(element);
   int belt_dir_nr = (game.belt_dir_nr[belt_nr] + 1) % 4;
   int belt_dir = belt_move_dir[belt_dir_nr];
@@ -5911,7 +6104,7 @@ static void ToggleBeltSwitch(int x, int y)
   if (belt_dir_nr == 3)
     belt_dir_nr = 1;
 
-  /* set frame order for belt animation graphic according to belt direction */
+  // set frame order for belt animation graphic according to belt direction
   for (i = 0; i < NUM_BELT_PARTS; i++)
   {
     int element = belt_base_active_element[belt_nr] + i;
@@ -5932,7 +6125,7 @@ static void ToggleBeltSwitch(int x, int y)
 
   SCAN_PLAYFIELD(xx, yy)
   {
-    int element = Feld[xx][yy];
+    int element = Tile[xx][yy];
 
     if (IS_BELT_SWITCH(element))
     {
@@ -5940,7 +6133,7 @@ static void ToggleBeltSwitch(int x, int y)
 
       if (e_belt_nr == belt_nr)
       {
-       Feld[xx][yy] = belt_base_switch_element[belt_nr] + belt_dir_nr;
+       Tile[xx][yy] = belt_base_switch_element[belt_nr] + belt_dir_nr;
        TEST_DrawLevelField(xx, yy);
       }
     }
@@ -5950,9 +6143,9 @@ static void ToggleBeltSwitch(int x, int y)
 
       if (e_belt_nr == belt_nr)
       {
-       int belt_part = Feld[xx][yy] - belt_base_element[belt_nr];
+       int belt_part = Tile[xx][yy] - belt_base_element[belt_nr];
 
-       Feld[xx][yy] = belt_base_active_element[belt_nr] + belt_part;
+       Tile[xx][yy] = belt_base_active_element[belt_nr] + belt_part;
        TEST_DrawLevelField(xx, yy);
       }
     }
@@ -5962,9 +6155,9 @@ static void ToggleBeltSwitch(int x, int y)
 
       if (e_belt_nr == belt_nr)
       {
-       int belt_part = Feld[xx][yy] - belt_base_active_element[belt_nr];
+       int belt_part = Tile[xx][yy] - belt_base_active_element[belt_nr];
 
-       Feld[xx][yy] = belt_base_element[belt_nr] + belt_part;
+       Tile[xx][yy] = belt_base_element[belt_nr] + belt_part;
        TEST_DrawLevelField(xx, yy);
       }
     }
@@ -5979,39 +6172,39 @@ static void ToggleSwitchgateSwitch(int x, int y)
 
   SCAN_PLAYFIELD(xx, yy)
   {
-    int element = Feld[xx][yy];
+    int element = Tile[xx][yy];
 
     if (element == EL_SWITCHGATE_SWITCH_UP)
     {
-      Feld[xx][yy] = EL_SWITCHGATE_SWITCH_DOWN;
+      Tile[xx][yy] = EL_SWITCHGATE_SWITCH_DOWN;
       TEST_DrawLevelField(xx, yy);
     }
     else if (element == EL_SWITCHGATE_SWITCH_DOWN)
     {
-      Feld[xx][yy] = EL_SWITCHGATE_SWITCH_UP;
+      Tile[xx][yy] = EL_SWITCHGATE_SWITCH_UP;
       TEST_DrawLevelField(xx, yy);
     }
     else if (element == EL_DC_SWITCHGATE_SWITCH_UP)
     {
-      Feld[xx][yy] = EL_DC_SWITCHGATE_SWITCH_DOWN;
+      Tile[xx][yy] = EL_DC_SWITCHGATE_SWITCH_DOWN;
       TEST_DrawLevelField(xx, yy);
     }
     else if (element == EL_DC_SWITCHGATE_SWITCH_DOWN)
     {
-      Feld[xx][yy] = EL_DC_SWITCHGATE_SWITCH_UP;
+      Tile[xx][yy] = EL_DC_SWITCHGATE_SWITCH_UP;
       TEST_DrawLevelField(xx, yy);
     }
     else if (element == EL_SWITCHGATE_OPEN ||
             element == EL_SWITCHGATE_OPENING)
     {
-      Feld[xx][yy] = EL_SWITCHGATE_CLOSING;
+      Tile[xx][yy] = EL_SWITCHGATE_CLOSING;
 
       PlayLevelSoundAction(xx, yy, ACTION_CLOSING);
     }
     else if (element == EL_SWITCHGATE_CLOSED ||
             element == EL_SWITCHGATE_CLOSING)
     {
-      Feld[xx][yy] = EL_SWITCHGATE_OPENING;
+      Tile[xx][yy] = EL_SWITCHGATE_OPENING;
 
       PlayLevelSoundAction(xx, yy, ACTION_OPENING);
     }
@@ -6040,30 +6233,30 @@ static void RedrawAllLightSwitchesAndInvisibleElements(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
 
     if (element == EL_LIGHT_SWITCH &&
        game.light_time_left > 0)
     {
-      Feld[x][y] = EL_LIGHT_SWITCH_ACTIVE;
+      Tile[x][y] = EL_LIGHT_SWITCH_ACTIVE;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_LIGHT_SWITCH_ACTIVE &&
             game.light_time_left == 0)
     {
-      Feld[x][y] = EL_LIGHT_SWITCH;
+      Tile[x][y] = EL_LIGHT_SWITCH;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_EMC_DRIPPER &&
             game.light_time_left > 0)
     {
-      Feld[x][y] = EL_EMC_DRIPPER_ACTIVE;
+      Tile[x][y] = EL_EMC_DRIPPER_ACTIVE;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_EMC_DRIPPER_ACTIVE &&
             game.light_time_left == 0)
     {
-      Feld[x][y] = EL_EMC_DRIPPER;
+      Tile[x][y] = EL_EMC_DRIPPER;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_INVISIBLE_STEELWALL ||
@@ -6071,11 +6264,11 @@ static void RedrawAllLightSwitchesAndInvisibleElements(void)
             element == EL_INVISIBLE_SAND)
     {
       if (game.light_time_left > 0)
-       Feld[x][y] = getInvisibleActiveFromInvisibleElement(element);
+       Tile[x][y] = getInvisibleActiveFromInvisibleElement(element);
 
       TEST_DrawLevelField(x, y);
 
-      /* uncrumble neighbour fields, if needed */
+      // uncrumble neighbour fields, if needed
       if (element == EL_INVISIBLE_SAND)
        TEST_DrawLevelFieldCrumbledNeighbours(x, y);
     }
@@ -6084,11 +6277,11 @@ static void RedrawAllLightSwitchesAndInvisibleElements(void)
             element == EL_INVISIBLE_SAND_ACTIVE)
     {
       if (game.light_time_left == 0)
-       Feld[x][y] = getInvisibleFromInvisibleActiveElement(element);
+       Tile[x][y] = getInvisibleFromInvisibleActiveElement(element);
 
       TEST_DrawLevelField(x, y);
 
-      /* re-crumble neighbour fields, if needed */
+      // re-crumble neighbour fields, if needed
       if (element == EL_INVISIBLE_SAND)
        TEST_DrawLevelFieldCrumbledNeighbours(x, y);
     }
@@ -6101,18 +6294,18 @@ static void RedrawAllInvisibleElementsForLenses(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
 
     if (element == EL_EMC_DRIPPER &&
        game.lenses_time_left > 0)
     {
-      Feld[x][y] = EL_EMC_DRIPPER_ACTIVE;
+      Tile[x][y] = EL_EMC_DRIPPER_ACTIVE;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_EMC_DRIPPER_ACTIVE &&
             game.lenses_time_left == 0)
     {
-      Feld[x][y] = EL_EMC_DRIPPER;
+      Tile[x][y] = EL_EMC_DRIPPER;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_INVISIBLE_STEELWALL ||
@@ -6120,11 +6313,11 @@ static void RedrawAllInvisibleElementsForLenses(void)
             element == EL_INVISIBLE_SAND)
     {
       if (game.lenses_time_left > 0)
-       Feld[x][y] = getInvisibleActiveFromInvisibleElement(element);
+       Tile[x][y] = getInvisibleActiveFromInvisibleElement(element);
 
       TEST_DrawLevelField(x, y);
 
-      /* uncrumble neighbour fields, if needed */
+      // uncrumble neighbour fields, if needed
       if (element == EL_INVISIBLE_SAND)
        TEST_DrawLevelFieldCrumbledNeighbours(x, y);
     }
@@ -6133,11 +6326,11 @@ static void RedrawAllInvisibleElementsForLenses(void)
             element == EL_INVISIBLE_SAND_ACTIVE)
     {
       if (game.lenses_time_left == 0)
-       Feld[x][y] = getInvisibleFromInvisibleActiveElement(element);
+       Tile[x][y] = getInvisibleFromInvisibleActiveElement(element);
 
       TEST_DrawLevelField(x, y);
 
-      /* re-crumble neighbour fields, if needed */
+      // re-crumble neighbour fields, if needed
       if (element == EL_INVISIBLE_SAND)
        TEST_DrawLevelFieldCrumbledNeighbours(x, y);
     }
@@ -6150,24 +6343,24 @@ static void RedrawAllInvisibleElementsForMagnifier(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
 
     if (element == EL_EMC_FAKE_GRASS &&
        game.magnify_time_left > 0)
     {
-      Feld[x][y] = EL_EMC_FAKE_GRASS_ACTIVE;
+      Tile[x][y] = EL_EMC_FAKE_GRASS_ACTIVE;
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_EMC_FAKE_GRASS_ACTIVE &&
             game.magnify_time_left == 0)
     {
-      Feld[x][y] = EL_EMC_FAKE_GRASS;
+      Tile[x][y] = EL_EMC_FAKE_GRASS;
       TEST_DrawLevelField(x, y);
     }
     else if (IS_GATE_GRAY(element) &&
             game.magnify_time_left > 0)
     {
-      Feld[x][y] = (IS_RND_GATE_GRAY(element) ?
+      Tile[x][y] = (IS_RND_GATE_GRAY(element) ?
                    element - EL_GATE_1_GRAY + EL_GATE_1_GRAY_ACTIVE :
                    IS_EM_GATE_GRAY(element) ?
                    element - EL_EM_GATE_1_GRAY + EL_EM_GATE_1_GRAY_ACTIVE :
@@ -6181,7 +6374,7 @@ static void RedrawAllInvisibleElementsForMagnifier(void)
     else if (IS_GATE_GRAY_ACTIVE(element) &&
             game.magnify_time_left == 0)
     {
-      Feld[x][y] = (IS_RND_GATE_GRAY_ACTIVE(element) ?
+      Tile[x][y] = (IS_RND_GATE_GRAY_ACTIVE(element) ?
                    element - EL_GATE_1_GRAY_ACTIVE + EL_GATE_1_GRAY :
                    IS_EM_GATE_GRAY_ACTIVE(element) ?
                    element - EL_EM_GATE_1_GRAY_ACTIVE + EL_EM_GATE_1_GRAY :
@@ -6197,7 +6390,7 @@ static void RedrawAllInvisibleElementsForMagnifier(void)
 
 static void ToggleLightSwitch(int x, int y)
 {
-  int element = Feld[x][y];
+  int element = Tile[x][y];
 
   game.light_time_left =
     (element == EL_LIGHT_SWITCH ?
@@ -6214,26 +6407,26 @@ static void ActivateTimegateSwitch(int x, int y)
 
   SCAN_PLAYFIELD(xx, yy)
   {
-    int element = Feld[xx][yy];
+    int element = Tile[xx][yy];
 
     if (element == EL_TIMEGATE_CLOSED ||
        element == EL_TIMEGATE_CLOSING)
     {
-      Feld[xx][yy] = EL_TIMEGATE_OPENING;
+      Tile[xx][yy] = EL_TIMEGATE_OPENING;
       PlayLevelSound(xx, yy, SND_CLASS_TIMEGATE_OPENING);
     }
 
     /*
     else if (element == EL_TIMEGATE_SWITCH_ACTIVE)
     {
-      Feld[xx][yy] = EL_TIMEGATE_SWITCH;
+      Tile[xx][yy] = EL_TIMEGATE_SWITCH;
       TEST_DrawLevelField(xx, yy);
     }
     */
 
   }
 
-  Feld[x][y] = (Feld[x][y] == EL_TIMEGATE_SWITCH ? EL_TIMEGATE_SWITCH_ACTIVE :
+  Tile[x][y] = (Tile[x][y] == EL_TIMEGATE_SWITCH ? EL_TIMEGATE_SWITCH_ACTIVE :
                EL_DC_TIMEGATE_SWITCH_ACTIVE);
 }
 
@@ -6242,39 +6435,39 @@ static void Impact(int x, int y)
   boolean last_line = (y == lev_fieldy - 1);
   boolean object_hit = FALSE;
   boolean impact = (last_line || object_hit);
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   int smashed = EL_STEELWALL;
 
-  if (!last_line)      /* check if element below was hit */
+  if (!last_line)      // check if element below was hit
   {
-    if (Feld[x][y + 1] == EL_PLAYER_IS_LEAVING)
+    if (Tile[x][y + 1] == EL_PLAYER_IS_LEAVING)
       return;
 
     object_hit = (!IS_FREE(x, y + 1) && (!IS_MOVING(x, y + 1) ||
                                         MovDir[x][y + 1] != MV_DOWN ||
                                         MovPos[x][y + 1] <= TILEY / 2));
 
-    /* do not smash moving elements that left the smashed field in time */
+    // do not smash moving elements that left the smashed field in time
     if (game.engine_version >= VERSION_IDENT(2,2,0,7) && IS_MOVING(x, y + 1) &&
        ABS(MovPos[x][y + 1] + getElementMoveStepsize(x, y + 1)) >= TILEX)
       object_hit = FALSE;
 
 #if USE_QUICKSAND_IMPACT_BUGFIX
-    if (Feld[x][y + 1] == EL_QUICKSAND_EMPTYING && object_hit == FALSE)
+    if (Tile[x][y + 1] == EL_QUICKSAND_EMPTYING && object_hit == FALSE)
     {
       RemoveMovingField(x, y + 1);
-      Feld[x][y + 1] = EL_QUICKSAND_EMPTY;
-      Feld[x][y + 2] = EL_ROCK;
+      Tile[x][y + 1] = EL_QUICKSAND_EMPTY;
+      Tile[x][y + 2] = EL_ROCK;
       TEST_DrawLevelField(x, y + 2);
 
       object_hit = TRUE;
     }
 
-    if (Feld[x][y + 1] == EL_QUICKSAND_FAST_EMPTYING && object_hit == FALSE)
+    if (Tile[x][y + 1] == EL_QUICKSAND_FAST_EMPTYING && object_hit == FALSE)
     {
       RemoveMovingField(x, y + 1);
-      Feld[x][y + 1] = EL_QUICKSAND_FAST_EMPTY;
-      Feld[x][y + 2] = EL_ROCK;
+      Tile[x][y + 1] = EL_QUICKSAND_FAST_EMPTY;
+      Tile[x][y + 2] = EL_ROCK;
       TEST_DrawLevelField(x, y + 2);
 
       object_hit = TRUE;
@@ -6287,14 +6480,14 @@ static void Impact(int x, int y)
     impact = (last_line || object_hit);
   }
 
-  if (!last_line && smashed == EL_ACID)        /* element falls into acid */
+  if (!last_line && smashed == EL_ACID)        // element falls into acid
   {
     SplashAcid(x, y + 1);
     return;
   }
 
-  /* !!! not sufficient for all cases -- see EL_PEARL below !!! */
-  /* only reset graphic animation if graphic really changes after impact */
+  // !!! not sufficient for all cases -- see EL_PEARL below !!!
+  // only reset graphic animation if graphic really changes after impact
   if (impact &&
       el_act_dir2img(element, GfxAction[x][y], MV_DOWN) != el2img(element))
   {
@@ -6312,7 +6505,7 @@ static void Impact(int x, int y)
   {
     ResetGfxAnimation(x, y);
 
-    Feld[x][y] = EL_PEARL_BREAKING;
+    Tile[x][y] = EL_PEARL_BREAKING;
     PlayLevelSound(x, y, SND_PEARL_BREAKING);
     return;
   }
@@ -6331,7 +6524,7 @@ static void Impact(int x, int y)
       Bang(x, y + 1);
     else
     {
-      Feld[x][y] = EL_AMOEBA_GROWING;
+      Tile[x][y] = EL_AMOEBA_GROWING;
       Store[x][y] = EL_AMOEBA_WET;
 
       ResetRandomAnimationValue(x, y);
@@ -6339,7 +6532,7 @@ static void Impact(int x, int y)
     return;
   }
 
-  if (object_hit)              /* check which object was hit */
+  if (object_hit)              // check which object was hit
   {
     if ((CAN_PASS_MAGIC_WALL(element) && 
         (smashed == EL_MAGIC_WALL ||
@@ -6353,11 +6546,11 @@ static void Impact(int x, int y)
         smashed == EL_BD_MAGIC_WALL ? EL_BD_MAGIC_WALL_ACTIVE :
         EL_DC_MAGIC_WALL_ACTIVE);
 
-      /* activate magic wall / mill */
+      // activate magic wall / mill
       SCAN_PLAYFIELD(xx, yy)
       {
-       if (Feld[xx][yy] == smashed)
-         Feld[xx][yy] = activated_magic_wall;
+       if (Tile[xx][yy] == smashed)
+         Tile[xx][yy] = activated_magic_wall;
       }
 
       game.magic_wall_time_left = level.time_magic_wall * FRAMES_PER_SECOND;
@@ -6423,7 +6616,7 @@ static void Impact(int x, int y)
        }
        else if (smashed == EL_NUT)
        {
-         Feld[x][y + 1] = EL_NUT_BREAKING;
+         Tile[x][y + 1] = EL_NUT_BREAKING;
          PlayLevelSound(x, y, SND_NUT_BREAKING);
          RaiseScoreElement(EL_NUT);
          return;
@@ -6432,13 +6625,13 @@ static void Impact(int x, int y)
        {
          ResetGfxAnimation(x, y);
 
-         Feld[x][y + 1] = EL_PEARL_BREAKING;
+         Tile[x][y + 1] = EL_PEARL_BREAKING;
          PlayLevelSound(x, y, SND_PEARL_BREAKING);
          return;
        }
        else if (smashed == EL_DIAMOND)
        {
-         Feld[x][y + 1] = EL_DIAMOND_BREAKING;
+         Tile[x][y + 1] = EL_DIAMOND_BREAKING;
          PlayLevelSound(x, y, SND_DIAMOND_BREAKING);
          return;
        }
@@ -6475,28 +6668,28 @@ static void Impact(int x, int y)
     }
   }
 
-  /* play sound of magic wall / mill */
+  // play sound of magic wall / mill
   if (!last_line &&
-      (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE ||
-       Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE ||
-       Feld[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE))
+      (Tile[x][y + 1] == EL_MAGIC_WALL_ACTIVE ||
+       Tile[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE ||
+       Tile[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE))
   {
-    if (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE)
+    if (Tile[x][y + 1] == EL_MAGIC_WALL_ACTIVE)
       PlayLevelSound(x, y, SND_MAGIC_WALL_FILLING);
-    else if (Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)
+    else if (Tile[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)
       PlayLevelSound(x, y, SND_BD_MAGIC_WALL_FILLING);
-    else if (Feld[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE)
+    else if (Tile[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE)
       PlayLevelSound(x, y, SND_DC_MAGIC_WALL_FILLING);
 
     return;
   }
 
-  /* play sound of object that hits the ground */
+  // play sound of object that hits the ground
   if (last_line || object_hit)
     PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
 }
 
-inline static void TurnRoundExt(int x, int y)
+static void TurnRoundExt(int x, int y)
 {
   static struct
   {
@@ -6527,7 +6720,7 @@ inline static void TurnRoundExt(int x, int y)
     { MV_RIGHT,        MV_LEFT,        MV_UP    }
   };
 
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   int move_pattern = element_info[element].move_pattern;
 
   int old_move_dir = MovDir[x][y];
@@ -6557,7 +6750,7 @@ inline static void TurnRoundExt(int x, int y)
 
     if (element == EL_BUG && MovDir[x][y] != old_move_dir)
       MovDelay[x][y] = 9;
-    else if (element == EL_BD_BUTTERFLY)     /* && MovDir[x][y] == left_dir) */
+    else if (element == EL_BD_BUTTERFLY)     // && MovDir[x][y] == left_dir)
       MovDelay[x][y] = 1;
   }
   else if (element == EL_SPACESHIP || element == EL_BD_FIREFLY)
@@ -6571,7 +6764,7 @@ inline static void TurnRoundExt(int x, int y)
 
     if (element == EL_SPACESHIP        && MovDir[x][y] != old_move_dir)
       MovDelay[x][y] = 9;
-    else if (element == EL_BD_FIREFLY)     /* && MovDir[x][y] == right_dir) */
+    else if (element == EL_BD_FIREFLY)     // && MovDir[x][y] == right_dir)
       MovDelay[x][y] = 1;
   }
   else if (element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
@@ -6695,7 +6888,7 @@ inline static void TurnRoundExt(int x, int y)
     yy = y + move_xy[MovDir[x][y]].dy;
 
     if (!IN_LEV_FIELD(xx, yy) ||
-        (!IS_FREE(xx, yy) && !IS_FOOD_PIG(Feld[xx][yy])))
+        (!IS_FREE(xx, yy) && !IS_FOOD_PIG(Tile[xx][yy])))
       MovDir[x][y] = old_move_dir;
 
     MovDelay[x][y] = 0;
@@ -6731,17 +6924,17 @@ inline static void TurnRoundExt(int x, int y)
   {
     boolean can_move_on =
       (MOLE_CAN_ENTER_FIELD(element, move_x, move_y,
-                           IS_AMOEBOID(Feld[move_x][move_y]) ||
-                           Feld[move_x][move_y] == EL_AMOEBA_SHRINKING));
+                           IS_AMOEBOID(Tile[move_x][move_y]) ||
+                           Tile[move_x][move_y] == EL_AMOEBA_SHRINKING));
     if (!can_move_on)
     {
       boolean can_turn_left =
        (MOLE_CAN_ENTER_FIELD(element, left_x, left_y,
-                             IS_AMOEBOID(Feld[left_x][left_y])));
+                             IS_AMOEBOID(Tile[left_x][left_y])));
 
       boolean can_turn_right =
        (MOLE_CAN_ENTER_FIELD(element, right_x, right_y,
-                             IS_AMOEBOID(Feld[right_x][right_y])));
+                             IS_AMOEBOID(Tile[right_x][right_y])));
 
       if (can_turn_left && can_turn_right)
        MovDir[x][y] = (RND(2) ? left_dir : right_dir);
@@ -6766,7 +6959,7 @@ inline static void TurnRoundExt(int x, int y)
       if (SPRING_CAN_BUMP_FROM_FIELD(move_x, move_y) &&
          !SPRING_CAN_ENTER_FIELD(element, x, y + 1))
       {
-       Feld[move_x][move_y] = EL_EMC_SPRING_BUMPER_ACTIVE;
+       Tile[move_x][move_y] = EL_EMC_SPRING_BUMPER_ACTIVE;
        ResetGfxAnimation(move_x, move_y);
        TEST_DrawLevelField(move_x, move_y);
 
@@ -6786,10 +6979,10 @@ inline static void TurnRoundExt(int x, int y)
   {
     int attr_x = -1, attr_y = -1;
 
-    if (AllPlayersGone)
+    if (game.all_players_gone)
     {
-      attr_x = ExitX;
-      attr_y = ExitY;
+      attr_x = game.exit_x;
+      attr_y = game.exit_y;
     }
     else
     {
@@ -6812,12 +7005,14 @@ inline static void TurnRoundExt(int x, int y)
       }
     }
 
-    if (element == EL_ROBOT && ZX >= 0 && ZY >= 0 &&
-       (Feld[ZX][ZY] == EL_ROBOT_WHEEL_ACTIVE ||
+    if (element == EL_ROBOT &&
+       game.robot_wheel_x >= 0 &&
+       game.robot_wheel_y >= 0 &&
+       (Tile[game.robot_wheel_x][game.robot_wheel_y] == EL_ROBOT_WHEEL_ACTIVE ||
         game.engine_version < VERSION_IDENT(3,1,0,0)))
     {
-      attr_x = ZX;
-      attr_y = ZY;
+      attr_x = game.robot_wheel_x;
+      attr_y = game.robot_wheel_y;
     }
 
     if (element == EL_PENGUIN)
@@ -6836,10 +7031,10 @@ inline static void TurnRoundExt(int x, int y)
        int ex = x + xy[i][0];
        int ey = y + xy[i][1];
 
-       if (IN_LEV_FIELD(ex, ey) && (Feld[ex][ey] == EL_EXIT_OPEN ||
-                                    Feld[ex][ey] == EL_EM_EXIT_OPEN ||
-                                    Feld[ex][ey] == EL_STEEL_EXIT_OPEN ||
-                                    Feld[ex][ey] == EL_EM_STEEL_EXIT_OPEN))
+       if (IN_LEV_FIELD(ex, ey) && (Tile[ex][ey] == EL_EXIT_OPEN ||
+                                    Tile[ex][ey] == EL_EM_EXIT_OPEN ||
+                                    Tile[ex][ey] == EL_STEEL_EXIT_OPEN ||
+                                    Tile[ex][ey] == EL_EM_STEEL_EXIT_OPEN))
        {
          attr_x = ex;
          attr_y = ey;
@@ -6850,13 +7045,13 @@ inline static void TurnRoundExt(int x, int y)
 
     MovDir[x][y] = MV_NONE;
     if (attr_x < x)
-      MovDir[x][y] |= (AllPlayersGone ? MV_RIGHT : MV_LEFT);
+      MovDir[x][y] |= (game.all_players_gone ? MV_RIGHT : MV_LEFT);
     else if (attr_x > x)
-      MovDir[x][y] |= (AllPlayersGone ? MV_LEFT : MV_RIGHT);
+      MovDir[x][y] |= (game.all_players_gone ? MV_LEFT : MV_RIGHT);
     if (attr_y < y)
-      MovDir[x][y] |= (AllPlayersGone ? MV_DOWN : MV_UP);
+      MovDir[x][y] |= (game.all_players_gone ? MV_DOWN : MV_UP);
     else if (attr_y > y)
-      MovDir[x][y] |= (AllPlayersGone ? MV_UP : MV_DOWN);
+      MovDir[x][y] |= (game.all_players_gone ? MV_UP : MV_DOWN);
 
     if (element == EL_ROBOT)
     {
@@ -6933,22 +7128,22 @@ inline static void TurnRoundExt(int x, int y)
     {
       static int check_pos[16] =
       {
-       -1,             /*  0 => (invalid)          */
-       7,              /*  1 => MV_LEFT            */
-       3,              /*  2 => MV_RIGHT           */
-       -1,             /*  3 => (invalid)          */
-       1,              /*  4 =>            MV_UP   */
-       0,              /*  5 => MV_LEFT  | MV_UP   */
-       2,              /*  6 => MV_RIGHT | MV_UP   */
-       -1,             /*  7 => (invalid)          */
-       5,              /*  8 =>            MV_DOWN */
-       6,              /*  9 => MV_LEFT  | MV_DOWN */
-       4,              /* 10 => MV_RIGHT | MV_DOWN */
-       -1,             /* 11 => (invalid)          */
-       -1,             /* 12 => (invalid)          */
-       -1,             /* 13 => (invalid)          */
-       -1,             /* 14 => (invalid)          */
-       -1,             /* 15 => (invalid)          */
+       -1,             //  0 => (invalid)
+       7,              //  1 => MV_LEFT
+       3,              //  2 => MV_RIGHT
+       -1,             //  3 => (invalid)
+       1,              //  4 =>            MV_UP
+       0,              //  5 => MV_LEFT  | MV_UP
+       2,              //  6 => MV_RIGHT | MV_UP
+       -1,             //  7 => (invalid)
+       5,              //  8 =>            MV_DOWN
+       6,              //  9 => MV_LEFT  | MV_DOWN
+       4,              // 10 => MV_RIGHT | MV_DOWN
+       -1,             // 11 => (invalid)
+       -1,             // 12 => (invalid)
+       -1,             // 13 => (invalid)
+       -1,             // 14 => (invalid)
+       -1,             // 15 => (invalid)
       };
       static struct
       {
@@ -6969,7 +7164,7 @@ inline static void TurnRoundExt(int x, int y)
       boolean can_clone = FALSE;
       int i;
 
-      /* check if there is any free field around current position */
+      // check if there is any free field around current position
       for (i = 0; i < 8; i++)
       {
        int newx = x + check_xy[i].dx;
@@ -6983,7 +7178,7 @@ inline static void TurnRoundExt(int x, int y)
        }
       }
 
-      if (can_clone)           /* randomly find an element to clone */
+      if (can_clone)           // randomly find an element to clone
       {
        can_clone = FALSE;
 
@@ -7002,7 +7197,7 @@ inline static void TurnRoundExt(int x, int y)
            element_info[element].move_leave_type = LEAVE_TYPE_LIMITED;
            element_info[element].move_leave_element = EL_TRIGGER_ELEMENT;
 
-           Store[x][y] = Feld[newx][newy];
+           Store[x][y] = Tile[newx][newy];
 
            can_clone = TRUE;
 
@@ -7011,7 +7206,7 @@ inline static void TurnRoundExt(int x, int y)
        }
       }
 
-      if (can_clone)           /* randomly find a direction to move */
+      if (can_clone)           // randomly find a direction to move
       {
        can_clone = FALSE;
 
@@ -7038,17 +7233,17 @@ inline static void TurnRoundExt(int x, int y)
        }
       }
 
-      if (can_clone)           /* cloning and moving successful */
+      if (can_clone)           // cloning and moving successful
        return;
 
-      /* cannot clone -- try to move towards player */
+      // cannot clone -- try to move towards player
 
       start_pos = check_pos[MovDir[x][y] & 0x0f];
       check_order = (RND(2) ? -1 : +1);
 
       for (i = 0; i < 3; i++)
       {
-       /* first check start_pos, then previous/next or (next/previous) pos */
+       // first check start_pos, then previous/next or (next/previous) pos
        int pos_raw = start_pos + (i < 2 ? i : -1) * check_order;
        int pos = (pos_raw + 8) % 8;
        int newx = x + check_xy[pos].dx;
@@ -7080,7 +7275,7 @@ inline static void TurnRoundExt(int x, int y)
     boolean can_turn_right =
       CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, right_x,right_y);
 
-    if (element_info[element].move_stepsize == 0)      /* "not moving" */
+    if (element_info[element].move_stepsize == 0)      // "not moving"
       return;
 
     if (move_pattern == MV_TURNING_LEFT)
@@ -7155,10 +7350,10 @@ inline static void TurnRoundExt(int x, int y)
     int newx, newy;
     boolean move_away = (move_pattern == MV_AWAY_FROM_PLAYER);
 
-    if (AllPlayersGone)
+    if (game.all_players_gone)
     {
-      attr_x = ExitX;
-      attr_y = ExitY;
+      attr_x = game.exit_x;
+      attr_y = game.exit_y;
     }
     else
     {
@@ -7198,7 +7393,7 @@ inline static void TurnRoundExt(int x, int y)
       boolean first_horiz = RND(2);
       int new_move_dir = MovDir[x][y];
 
-      if (element_info[element].move_stepsize == 0)    /* "not moving" */
+      if (element_info[element].move_stepsize == 0)    // "not moving"
       {
        first_horiz = (ABS(attr_x - x) >= ABS(attr_y - y));
        MovDir[x][y] &= (first_horiz ? MV_HORIZONTAL : MV_VERTICAL);
@@ -7254,7 +7449,7 @@ inline static void TurnRoundExt(int x, int y)
       MV_RIGHT,
     };
     boolean hunter_mode = (move_pattern == MV_MAZE_HUNTER);
-    int move_preference = -1000000;    /* start with very low preference */
+    int move_preference = -1000000;    // start with very low preference
     int new_move_dir = MV_NONE;
     int start_test = RND(4);
     int i;
@@ -7268,7 +7463,7 @@ inline static void TurnRoundExt(int x, int y)
       yy = y + test_xy[start_test + i][1];
 
       if (hunter_mode && IN_LEV_FIELD(xx, yy) &&
-         (IS_PLAYER(xx, yy) || Feld[xx][yy] == EL_PLAYER_IS_LEAVING))
+         (IS_PLAYER(xx, yy) || Tile[xx][yy] == EL_PLAYER_IS_LEAVING))
       {
        new_move_dir = move_dir;
 
@@ -7284,14 +7479,14 @@ inline static void TurnRoundExt(int x, int y)
 
       if (move_dir_preference > move_preference)
       {
-       /* prefer field that has not been visited for the longest time */
+       // prefer field that has not been visited for the longest time
        move_preference = move_dir_preference;
        new_move_dir = move_dir;
       }
       else if (move_dir_preference == move_preference &&
               move_dir == old_move_dir)
       {
-       /* prefer last direction when all directions are preferred equally */
+       // prefer last direction when all directions are preferred equally
        move_preference = move_dir_preference;
        new_move_dir = move_dir;
       }
@@ -7343,8 +7538,8 @@ static boolean JustBeingPushed(int x, int y)
 
 static void StartMoving(int x, int y)
 {
-  boolean started_moving = FALSE;      /* some elements can fall _and_ move */
-  int element = Feld[x][y];
+  boolean started_moving = FALSE;      // some elements can fall _and_ move
+  int element = Tile[x][y];
 
   if (Stop[x][y])
     return;
@@ -7366,7 +7561,7 @@ static void StartMoving(int x, int y)
        InitMovingField(x, y, MV_DOWN);
        started_moving = TRUE;
 
-       Feld[x][y] = EL_QUICKSAND_EMPTYING;
+       Tile[x][y] = EL_QUICKSAND_EMPTYING;
 #if USE_QUICKSAND_BD_ROCK_BUGFIX
        if (Store[x][y] != EL_ROCK && Store[x][y] != EL_BD_ROCK)
          Store[x][y] = EL_ROCK;
@@ -7376,7 +7571,7 @@ static void StartMoving(int x, int y)
 
        PlayLevelSoundAction(x, y, ACTION_EMPTYING);
       }
-      else if (Feld[x][y + 1] == EL_QUICKSAND_EMPTY)
+      else if (Tile[x][y + 1] == EL_QUICKSAND_EMPTY)
       {
        if (!MovDelay[x][y])
        {
@@ -7396,14 +7591,14 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_QUICKSAND_EMPTY;
-       Feld[x][y + 1] = EL_QUICKSAND_FULL;
+       Tile[x][y] = EL_QUICKSAND_EMPTY;
+       Tile[x][y + 1] = EL_QUICKSAND_FULL;
        Store[x][y + 1] = Store[x][y];
        Store[x][y] = 0;
 
        PlayLevelSoundAction(x, y, ACTION_FILLING);
       }
-      else if (Feld[x][y + 1] == EL_QUICKSAND_FAST_EMPTY)
+      else if (Tile[x][y + 1] == EL_QUICKSAND_FAST_EMPTY)
       {
        if (!MovDelay[x][y])
        {
@@ -7423,8 +7618,8 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_QUICKSAND_EMPTY;
-       Feld[x][y + 1] = EL_QUICKSAND_FAST_FULL;
+       Tile[x][y] = EL_QUICKSAND_EMPTY;
+       Tile[x][y + 1] = EL_QUICKSAND_FAST_FULL;
        Store[x][y + 1] = Store[x][y];
        Store[x][y] = 0;
 
@@ -7438,7 +7633,7 @@ static void StartMoving(int x, int y)
        InitMovingField(x, y, MV_DOWN);
        started_moving = TRUE;
 
-       Feld[x][y] = EL_QUICKSAND_FAST_EMPTYING;
+       Tile[x][y] = EL_QUICKSAND_FAST_EMPTYING;
 #if USE_QUICKSAND_BD_ROCK_BUGFIX
        if (Store[x][y] != EL_ROCK && Store[x][y] != EL_BD_ROCK)
          Store[x][y] = EL_ROCK;
@@ -7448,7 +7643,7 @@ static void StartMoving(int x, int y)
 
        PlayLevelSoundAction(x, y, ACTION_EMPTYING);
       }
-      else if (Feld[x][y + 1] == EL_QUICKSAND_FAST_EMPTY)
+      else if (Tile[x][y + 1] == EL_QUICKSAND_FAST_EMPTY)
       {
        if (!MovDelay[x][y])
        {
@@ -7468,14 +7663,14 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_QUICKSAND_FAST_EMPTY;
-       Feld[x][y + 1] = EL_QUICKSAND_FAST_FULL;
+       Tile[x][y] = EL_QUICKSAND_FAST_EMPTY;
+       Tile[x][y + 1] = EL_QUICKSAND_FAST_FULL;
        Store[x][y + 1] = Store[x][y];
        Store[x][y] = 0;
 
        PlayLevelSoundAction(x, y, ACTION_FILLING);
       }
-      else if (Feld[x][y + 1] == EL_QUICKSAND_EMPTY)
+      else if (Tile[x][y + 1] == EL_QUICKSAND_EMPTY)
       {
        if (!MovDelay[x][y])
        {
@@ -7495,8 +7690,8 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_QUICKSAND_FAST_EMPTY;
-       Feld[x][y + 1] = EL_QUICKSAND_FULL;
+       Tile[x][y] = EL_QUICKSAND_FAST_EMPTY;
+       Tile[x][y + 1] = EL_QUICKSAND_FULL;
        Store[x][y + 1] = Store[x][y];
        Store[x][y] = 0;
 
@@ -7504,23 +7699,23 @@ static void StartMoving(int x, int y)
       }
     }
     else if ((element == EL_ROCK || element == EL_BD_ROCK) &&
-            Feld[x][y + 1] == EL_QUICKSAND_EMPTY)
+            Tile[x][y + 1] == EL_QUICKSAND_EMPTY)
     {
       InitMovingField(x, y, MV_DOWN);
       started_moving = TRUE;
 
-      Feld[x][y] = EL_QUICKSAND_FILLING;
+      Tile[x][y] = EL_QUICKSAND_FILLING;
       Store[x][y] = element;
 
       PlayLevelSoundAction(x, y, ACTION_FILLING);
     }
     else if ((element == EL_ROCK || element == EL_BD_ROCK) &&
-            Feld[x][y + 1] == EL_QUICKSAND_FAST_EMPTY)
+            Tile[x][y + 1] == EL_QUICKSAND_FAST_EMPTY)
     {
       InitMovingField(x, y, MV_DOWN);
       started_moving = TRUE;
 
-      Feld[x][y] = EL_QUICKSAND_FAST_FILLING;
+      Tile[x][y] = EL_QUICKSAND_FAST_FILLING;
       Store[x][y] = element;
 
       PlayLevelSoundAction(x, y, ACTION_FILLING);
@@ -7532,10 +7727,10 @@ static void StartMoving(int x, int y)
        InitMovingField(x, y, MV_DOWN);
        started_moving = TRUE;
 
-       Feld[x][y] = EL_MAGIC_WALL_EMPTYING;
+       Tile[x][y] = EL_MAGIC_WALL_EMPTYING;
        Store[x][y] = EL_CHANGED(Store[x][y]);
       }
-      else if (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE)
+      else if (Tile[x][y + 1] == EL_MAGIC_WALL_ACTIVE)
       {
        if (!MovDelay[x][y])
          MovDelay[x][y] = TILEY / 4 + 1;
@@ -7547,8 +7742,8 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_MAGIC_WALL_ACTIVE;
-       Feld[x][y + 1] = EL_MAGIC_WALL_FULL;
+       Tile[x][y] = EL_MAGIC_WALL_ACTIVE;
+       Tile[x][y + 1] = EL_MAGIC_WALL_FULL;
        Store[x][y + 1] = EL_CHANGED(Store[x][y]);
        Store[x][y] = 0;
       }
@@ -7560,10 +7755,10 @@ static void StartMoving(int x, int y)
        InitMovingField(x, y, MV_DOWN);
        started_moving = TRUE;
 
-       Feld[x][y] = EL_BD_MAGIC_WALL_EMPTYING;
+       Tile[x][y] = EL_BD_MAGIC_WALL_EMPTYING;
        Store[x][y] = EL_CHANGED_BD(Store[x][y]);
       }
-      else if (Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)
+      else if (Tile[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)
       {
        if (!MovDelay[x][y])
          MovDelay[x][y] = TILEY / 4 + 1;
@@ -7575,8 +7770,8 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_BD_MAGIC_WALL_ACTIVE;
-       Feld[x][y + 1] = EL_BD_MAGIC_WALL_FULL;
+       Tile[x][y] = EL_BD_MAGIC_WALL_ACTIVE;
+       Tile[x][y + 1] = EL_BD_MAGIC_WALL_FULL;
        Store[x][y + 1] = EL_CHANGED_BD(Store[x][y]);
        Store[x][y] = 0;
       }
@@ -7588,10 +7783,10 @@ static void StartMoving(int x, int y)
        InitMovingField(x, y, MV_DOWN);
        started_moving = TRUE;
 
-       Feld[x][y] = EL_DC_MAGIC_WALL_EMPTYING;
+       Tile[x][y] = EL_DC_MAGIC_WALL_EMPTYING;
        Store[x][y] = EL_CHANGED_DC(Store[x][y]);
       }
-      else if (Feld[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE)
+      else if (Tile[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE)
       {
        if (!MovDelay[x][y])
          MovDelay[x][y] = TILEY / 4 + 1;
@@ -7603,29 +7798,29 @@ static void StartMoving(int x, int y)
            return;
        }
 
-       Feld[x][y] = EL_DC_MAGIC_WALL_ACTIVE;
-       Feld[x][y + 1] = EL_DC_MAGIC_WALL_FULL;
+       Tile[x][y] = EL_DC_MAGIC_WALL_ACTIVE;
+       Tile[x][y + 1] = EL_DC_MAGIC_WALL_FULL;
        Store[x][y + 1] = EL_CHANGED_DC(Store[x][y]);
        Store[x][y] = 0;
       }
     }
     else if ((CAN_PASS_MAGIC_WALL(element) &&
-             (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE ||
-              Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)) ||
+             (Tile[x][y + 1] == EL_MAGIC_WALL_ACTIVE ||
+              Tile[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)) ||
             (CAN_PASS_DC_MAGIC_WALL(element) &&
-             (Feld[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE)))
+             (Tile[x][y + 1] == EL_DC_MAGIC_WALL_ACTIVE)))
 
     {
       InitMovingField(x, y, MV_DOWN);
       started_moving = TRUE;
 
-      Feld[x][y] =
-       (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE ? EL_MAGIC_WALL_FILLING :
-        Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE ? EL_BD_MAGIC_WALL_FILLING :
+      Tile[x][y] =
+       (Tile[x][y + 1] == EL_MAGIC_WALL_ACTIVE ? EL_MAGIC_WALL_FILLING :
+        Tile[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE ? EL_BD_MAGIC_WALL_FILLING :
         EL_DC_MAGIC_WALL_FILLING);
       Store[x][y] = element;
     }
-    else if (CAN_FALL(element) && Feld[x][y + 1] == EL_ACID)
+    else if (CAN_FALL(element) && Tile[x][y + 1] == EL_ACID)
     {
       SplashAcid(x, y + 1);
 
@@ -7639,11 +7834,11 @@ static void StartMoving(int x, int y)
              CheckImpact[x][y] && !IS_FREE(x, y + 1)) ||
             (game.engine_version >= VERSION_IDENT(3,0,7,0) &&
              CAN_FALL(element) && WasJustFalling[x][y] &&
-             (Feld[x][y + 1] == EL_BLOCKED || IS_PLAYER(x, y + 1))) ||
+             (Tile[x][y + 1] == EL_BLOCKED || IS_PLAYER(x, y + 1))) ||
 
             (game.engine_version < VERSION_IDENT(2,2,0,7) &&
              CAN_FALL(element) && WasJustMoving[x][y] && !Pushed[x][y + 1] &&
-             (Feld[x][y + 1] == EL_BLOCKED)))
+             (Tile[x][y + 1] == EL_BLOCKED)))
     {
       /* this is needed for a special case not covered by calling "Impact()"
         from "ContinueMoving()": if an element moves to a tile directly below
@@ -7668,9 +7863,9 @@ static void StartMoving(int x, int y)
        started_moving = TRUE;
       }
     }
-    else if (IS_FREE(x, y + 1) || Feld[x][y + 1] == EL_DIAMOND_BREAKING)
+    else if (IS_FREE(x, y + 1) || Tile[x][y + 1] == EL_DIAMOND_BREAKING)
     {
-      if (WasJustFalling[x][y])        /* prevent animation from being restarted */
+      if (WasJustFalling[x][y])        // prevent animation from being restarted
        MovDir[x][y] = MV_DOWN;
 
       InitMovingField(x, y, MV_DOWN);
@@ -7678,23 +7873,23 @@ static void StartMoving(int x, int y)
     }
     else if (element == EL_AMOEBA_DROP)
     {
-      Feld[x][y] = EL_AMOEBA_GROWING;
+      Tile[x][y] = EL_AMOEBA_GROWING;
       Store[x][y] = EL_AMOEBA_WET;
     }
-    else if (((IS_SLIPPERY(Feld[x][y + 1]) && !IS_PLAYER(x, y + 1)) ||
-             (IS_EM_SLIPPERY_WALL(Feld[x][y + 1]) && IS_GEM(element))) &&
+    else if (((IS_SLIPPERY(Tile[x][y + 1]) && !IS_PLAYER(x, y + 1)) ||
+             (IS_EM_SLIPPERY_WALL(Tile[x][y + 1]) && IS_GEM(element))) &&
             !IS_FALLING(x, y + 1) && !WasJustMoving[x][y + 1] &&
             element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
     {
       boolean can_fall_left  = (x > 0 && IS_FREE(x - 1, y) &&
                                (IS_FREE(x - 1, y + 1) ||
-                                Feld[x - 1][y + 1] == EL_ACID));
+                                Tile[x - 1][y + 1] == EL_ACID));
       boolean can_fall_right = (x < lev_fieldx - 1 && IS_FREE(x + 1, y) &&
                                (IS_FREE(x + 1, y + 1) ||
-                                Feld[x + 1][y + 1] == EL_ACID));
+                                Tile[x + 1][y + 1] == EL_ACID));
       boolean can_fall_any  = (can_fall_left || can_fall_right);
       boolean can_fall_both = (can_fall_left && can_fall_right);
-      int slippery_type = element_info[Feld[x][y + 1]].slippery_type;
+      int slippery_type = element_info[Tile[x][y + 1]].slippery_type;
 
       if (can_fall_any && slippery_type != SLIPPERY_ANY_RANDOM)
       {
@@ -7714,7 +7909,7 @@ static void StartMoving(int x, int y)
       if (can_fall_both)
       {
        if (element == EL_BD_ROCK || element == EL_BD_DIAMOND)
-         can_fall_right = FALSE;       /* slip down on left side */
+         can_fall_right = FALSE;       // slip down on left side
        else
          can_fall_left = !(can_fall_right = RND(2));
 
@@ -7723,16 +7918,16 @@ static void StartMoving(int x, int y)
 
       if (can_fall_any)
       {
-       /* if not determined otherwise, prefer left side for slipping down */
+       // if not determined otherwise, prefer left side for slipping down
        InitMovingField(x, y, can_fall_left ? MV_LEFT : MV_RIGHT);
        started_moving = TRUE;
       }
     }
-    else if (IS_BELT_ACTIVE(Feld[x][y + 1]))
+    else if (IS_BELT_ACTIVE(Tile[x][y + 1]))
     {
       boolean left_is_free  = (x > 0 && IS_FREE(x - 1, y));
       boolean right_is_free = (x < lev_fieldx - 1 && IS_FREE(x + 1, y));
-      int belt_nr = getBeltNrFromBeltActiveElement(Feld[x][y + 1]);
+      int belt_nr = getBeltNrFromBeltActiveElement(Tile[x][y + 1]);
       int belt_dir = game.belt_dir[belt_nr];
 
       if ((belt_dir == MV_LEFT  && left_is_free) ||
@@ -7750,12 +7945,12 @@ static void StartMoving(int x, int y)
       }
       else
       {
-       MovDir[x][y] = 0;       /* if element was moving, stop it */
+       MovDir[x][y] = 0;       // if element was moving, stop it
       }
     }
   }
 
-  /* not "else if" because of elements that can fall and move (EL_SPRING) */
+  // not "else if" because of elements that can fall and move (EL_SPRING)
   if (CAN_MOVE(element) && !started_moving)
   {
     int move_pattern = element_info[element].move_pattern;
@@ -7774,14 +7969,14 @@ static void StartMoving(int x, int y)
 
       TestIfElementHitsCustomElement(x, y, MovDir[x][y]);
 
-      if (Feld[x][y] != element)       /* element has changed */
+      if (Tile[x][y] != element)       // element has changed
        return;
     }
 
-    if (!MovDelay[x][y])       /* start new movement phase */
+    if (!MovDelay[x][y])       // start new movement phase
     {
-      /* all objects that can change their move direction after each step
-        (YAMYAM, DARK_YAMYAM and PACMAN go straight until they hit a wall */
+      // all objects that can change their move direction after each step
+      // (YAMYAM, DARK_YAMYAM and PACMAN go straight until they hit a wall
 
       if (element != EL_YAMYAM &&
          element != EL_DARK_YAMYAM &&
@@ -7804,7 +7999,7 @@ static void StartMoving(int x, int y)
       }
     }
 
-    if (MovDelay[x][y])                /* wait some time before next movement */
+    if (MovDelay[x][y])                // wait some time before next movement
     {
       MovDelay[x][y]--;
 
@@ -7846,7 +8041,7 @@ static void StartMoving(int x, int y)
          int sy = SCREENY(yy);
          int flame_graphic = graphic + (i - 1);
 
-         if (!IN_LEV_FIELD(xx, yy) || IS_DRAGONFIRE_PROOF(Feld[xx][yy]))
+         if (!IN_LEV_FIELD(xx, yy) || IS_DRAGONFIRE_PROOF(Tile[xx][yy]))
            break;
 
          if (MovDelay[x][y])
@@ -7860,7 +8055,7 @@ static void StartMoving(int x, int y)
 
            ChangeDelay[xx][yy] = 0;
 
-           Feld[xx][yy] = EL_FLAMES;
+           Tile[xx][yy] = EL_FLAMES;
 
            if (IN_SCR_FIELD(sx, sy))
            {
@@ -7870,14 +8065,14 @@ static void StartMoving(int x, int y)
          }
          else
          {
-           if (Feld[xx][yy] == EL_FLAMES)
-             Feld[xx][yy] = EL_EMPTY;
+           if (Tile[xx][yy] == EL_FLAMES)
+             Tile[xx][yy] = EL_EMPTY;
            TEST_DrawLevelField(xx, yy);
          }
        }
       }
 
-      if (MovDelay[x][y])      /* element still has to wait some time */
+      if (MovDelay[x][y])      // element still has to wait some time
       {
        PlayLevelSoundAction(x, y, ACTION_WAITING);
 
@@ -7885,9 +8080,9 @@ static void StartMoving(int x, int y)
       }
     }
 
-    /* now make next step */
+    // now make next step
 
-    Moving2Blocked(x, y, &newx, &newy);        /* get next screen position */
+    Moving2Blocked(x, y, &newx, &newy);        // get next screen position
 
     if (DONT_COLLIDE_WITH(element) &&
        IN_LEV_FIELD(newx, newy) && IS_PLAYER(newx, newy) &&
@@ -7899,7 +8094,7 @@ static void StartMoving(int x, int y)
     }
 
     else if (CAN_MOVE_INTO_ACID(element) &&
-            IN_LEV_FIELD(newx, newy) && Feld[newx][newy] == EL_ACID &&
+            IN_LEV_FIELD(newx, newy) && Tile[newx][newy] == EL_ACID &&
             !IS_MV_DIAGONAL(MovDir[x][y]) &&
             (MovDir[x][y] == MV_DOWN ||
              game.engine_version >= VERSION_IDENT(3,1,0,0)))
@@ -7909,10 +8104,10 @@ static void StartMoving(int x, int y)
     }
     else if (element == EL_PENGUIN && IN_LEV_FIELD(newx, newy))
     {
-      if (Feld[newx][newy] == EL_EXIT_OPEN ||
-         Feld[newx][newy] == EL_EM_EXIT_OPEN ||
-         Feld[newx][newy] == EL_STEEL_EXIT_OPEN ||
-         Feld[newx][newy] == EL_EM_STEEL_EXIT_OPEN)
+      if (Tile[newx][newy] == EL_EXIT_OPEN ||
+         Tile[newx][newy] == EL_EM_EXIT_OPEN ||
+         Tile[newx][newy] == EL_STEEL_EXIT_OPEN ||
+         Tile[newx][newy] == EL_EM_STEEL_EXIT_OPEN)
       {
        RemoveField(x, y);
        TEST_DrawLevelField(x, y);
@@ -7921,14 +8116,15 @@ static void StartMoving(int x, int y)
        if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
          DrawGraphicThruMask(SCREENX(newx),SCREENY(newy), el2img(element), 0);
 
-       local_player->friends_still_needed--;
-       if (!local_player->friends_still_needed &&
-           !local_player->GameOver && AllPlayersGone)
-         PlayerWins(local_player);
+       game.friends_still_needed--;
+       if (!game.friends_still_needed &&
+           !game.GameOver &&
+           game.all_players_gone)
+         LevelSolved();
 
        return;
       }
-      else if (IS_FOOD_PENGUIN(Feld[newx][newy]))
+      else if (IS_FOOD_PENGUIN(Tile[newx][newy]))
       {
        if (DigField(local_player, x, y, newx, newy, 0,0, DF_DIG) == MP_MOVING)
          TEST_DrawLevelField(newx, newy);
@@ -7949,13 +8145,13 @@ static void StartMoving(int x, int y)
     }
     else if (element == EL_PIG && IN_LEV_FIELD(newx, newy))
     {
-      if (IS_FOOD_PIG(Feld[newx][newy]))
+      if (IS_FOOD_PIG(Tile[newx][newy]))
       {
        if (IS_MOVING(newx, newy))
          RemoveMovingField(newx, newy);
        else
        {
-         Feld[newx][newy] = EL_EMPTY;
+         Tile[newx][newy] = EL_EMPTY;
          TEST_DrawLevelField(newx, newy);
        }
 
@@ -7978,10 +8174,10 @@ static void StartMoving(int x, int y)
        boolean can_clone = FALSE;
        int xx, yy;
 
-       /* check if element to clone is still there */
+       // check if element to clone is still there
        for (yy = y - 1; yy <= y + 1; yy++) for (xx = x - 1; xx <= x + 1; xx++)
        {
-         if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == Store[x][y])
+         if (IN_LEV_FIELD(xx, yy) && Tile[xx][yy] == Store[x][y])
          {
            can_clone = TRUE;
 
@@ -7989,7 +8185,7 @@ static void StartMoving(int x, int y)
          }
        }
 
-       /* cannot clone or target field not free anymore -- do not clone */
+       // cannot clone or target field not free anymore -- do not clone
        if (!can_clone || !ANDROID_CAN_ENTER_FIELD(element, newx, newy))
          Store[x][y] = EL_EMPTY;
       }
@@ -8003,7 +8199,7 @@ static void StartMoving(int x, int y)
          int change_delay = 8;
          int graphic;
 
-         /* android is moving diagonally */
+         // android is moving diagonally
 
          CreateField(x, y, EL_DIAGONAL_SHRINKING);
 
@@ -8019,7 +8215,7 @@ static void StartMoving(int x, int y)
          DrawLevelGraphicAnimation(x, y, graphic);
          PlayLevelSoundAction(x, y, ACTION_SHRINKING);
 
-         if (Feld[newx][newy] == EL_ACID)
+         if (Tile[newx][newy] == EL_ACID)
          {
            SplashAcid(newx, newy);
 
@@ -8044,7 +8240,7 @@ static void StartMoving(int x, int y)
        }
        else
        {
-         Feld[newx][newy] = EL_EMPTY;
+         Tile[newx][newy] = EL_EMPTY;
          TEST_DrawLevelField(newx, newy);
 
          PlayLevelSoundAction(x, y, ACTION_DIGGING);
@@ -8064,7 +8260,7 @@ static void StartMoving(int x, int y)
       if (move_pattern & MV_MAZE_RUNNER_STYLE)
       {
        RunnerVisit[x][y] = FrameCounter;
-       PlayerVisit[x][y] /= 8;         /* expire player visit path */
+       PlayerVisit[x][y] /= 8;         // expire player visit path
       }
     }
     else if (element == EL_DRAGON && IN_LEV_FIELD(newx, newy))
@@ -8107,37 +8303,37 @@ static void StartMoving(int x, int y)
 
          MovDelay[x][y] = 50;
 
-         Feld[newx][newy] = EL_FLAMES;
-         if (IN_LEV_FIELD(newx1, newy1) && Feld[newx1][newy1] == EL_EMPTY)
-           Feld[newx1][newy1] = EL_FLAMES;
-         if (IN_LEV_FIELD(newx2, newy2) && Feld[newx2][newy2] == EL_EMPTY)
-           Feld[newx2][newy2] = EL_FLAMES;
+         Tile[newx][newy] = EL_FLAMES;
+         if (IN_LEV_FIELD(newx1, newy1) && Tile[newx1][newy1] == EL_EMPTY)
+           Tile[newx1][newy1] = EL_FLAMES;
+         if (IN_LEV_FIELD(newx2, newy2) && Tile[newx2][newy2] == EL_EMPTY)
+           Tile[newx2][newy2] = EL_FLAMES;
 
          return;
        }
       }
     }
     else if (element == EL_YAMYAM && IN_LEV_FIELD(newx, newy) &&
-            Feld[newx][newy] == EL_DIAMOND)
+            Tile[newx][newy] == EL_DIAMOND)
     {
       if (IS_MOVING(newx, newy))
        RemoveMovingField(newx, newy);
       else
       {
-       Feld[newx][newy] = EL_EMPTY;
+       Tile[newx][newy] = EL_EMPTY;
        TEST_DrawLevelField(newx, newy);
       }
 
       PlayLevelSound(x, y, SND_YAMYAM_DIGGING);
     }
     else if (element == EL_DARK_YAMYAM && IN_LEV_FIELD(newx, newy) &&
-            IS_FOOD_DARK_YAMYAM(Feld[newx][newy]))
+            IS_FOOD_DARK_YAMYAM(Tile[newx][newy]))
     {
       if (AmoebaNr[newx][newy])
       {
        AmoebaCnt2[AmoebaNr[newx][newy]]--;
-       if (Feld[newx][newy] == EL_AMOEBA_FULL ||
-           Feld[newx][newy] == EL_BD_AMOEBA)
+       if (Tile[newx][newy] == EL_AMOEBA_FULL ||
+           Tile[newx][newy] == EL_BD_AMOEBA)
          AmoebaCnt[AmoebaNr[newx][newy]]--;
       }
 
@@ -8147,57 +8343,57 @@ static void StartMoving(int x, int y)
       }
       else
       {
-       Feld[newx][newy] = EL_EMPTY;
+       Tile[newx][newy] = EL_EMPTY;
        TEST_DrawLevelField(newx, newy);
       }
 
       PlayLevelSound(x, y, SND_DARK_YAMYAM_DIGGING);
     }
     else if ((element == EL_PACMAN || element == EL_MOLE)
-            && IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Feld[newx][newy]))
+            && IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Tile[newx][newy]))
     {
       if (AmoebaNr[newx][newy])
       {
        AmoebaCnt2[AmoebaNr[newx][newy]]--;
-       if (Feld[newx][newy] == EL_AMOEBA_FULL ||
-           Feld[newx][newy] == EL_BD_AMOEBA)
+       if (Tile[newx][newy] == EL_AMOEBA_FULL ||
+           Tile[newx][newy] == EL_BD_AMOEBA)
          AmoebaCnt[AmoebaNr[newx][newy]]--;
       }
 
       if (element == EL_MOLE)
       {
-       Feld[newx][newy] = EL_AMOEBA_SHRINKING;
+       Tile[newx][newy] = EL_AMOEBA_SHRINKING;
        PlayLevelSound(x, y, SND_MOLE_DIGGING);
 
        ResetGfxAnimation(x, y);
        GfxAction[x][y] = ACTION_DIGGING;
        TEST_DrawLevelField(x, y);
 
-       MovDelay[newx][newy] = 0;       /* start amoeba shrinking delay */
+       MovDelay[newx][newy] = 0;       // start amoeba shrinking delay
 
-       return;                         /* wait for shrinking amoeba */
+       return;                         // wait for shrinking amoeba
       }
-      else     /* element == EL_PACMAN */
+      else     // element == EL_PACMAN
       {
-       Feld[newx][newy] = EL_EMPTY;
+       Tile[newx][newy] = EL_EMPTY;
        TEST_DrawLevelField(newx, newy);
        PlayLevelSound(x, y, SND_PACMAN_DIGGING);
       }
     }
     else if (element == EL_MOLE && IN_LEV_FIELD(newx, newy) &&
-            (Feld[newx][newy] == EL_AMOEBA_SHRINKING ||
-             (Feld[newx][newy] == EL_EMPTY && Stop[newx][newy])))
+            (Tile[newx][newy] == EL_AMOEBA_SHRINKING ||
+             (Tile[newx][newy] == EL_EMPTY && Stop[newx][newy])))
     {
-      /* wait for shrinking amoeba to completely disappear */
+      // wait for shrinking amoeba to completely disappear
       return;
     }
     else if (!IN_LEV_FIELD(newx, newy) || !IS_FREE(newx, newy))
     {
-      /* object was running against a wall */
+      // object was running against a wall
 
       TurnRound(x, y);
 
-      if (GFX_ELEMENT(element) != EL_SAND)     /* !!! FIX THIS (crumble) !!! */
+      if (GFX_ELEMENT(element) != EL_SAND)     // !!! FIX THIS (crumble) !!!
        DrawLevelElementAnimation(x, y, element);
 
       if (DONT_TOUCH(element))
@@ -8217,7 +8413,7 @@ static void StartMoving(int x, int y)
 
 void ContinueMoving(int x, int y)
 {
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   struct ElementInfo *ei = &element_info[element];
   int direction = MovDir[x][y];
   int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
@@ -8231,112 +8427,112 @@ void ContinueMoving(int x, int y)
 
   MovPos[x][y] += getElementMoveStepsize(x, y);
 
-  if (pushed_by_player)        /* special case: moving object pushed by player */
+  if (pushed_by_player)        // special case: moving object pushed by player
     MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos));
 
   if (ABS(MovPos[x][y]) < TILEX)
   {
     TEST_DrawLevelField(x, y);
 
-    return;    /* element is still moving */
+    return;    // element is still moving
   }
 
-  /* element reached destination field */
+  // element reached destination field
 
-  Feld[x][y] = EL_EMPTY;
-  Feld[newx][newy] = element;
-  MovPos[x][y] = 0;    /* force "not moving" for "crumbled sand" */
+  Tile[x][y] = EL_EMPTY;
+  Tile[newx][newy] = element;
+  MovPos[x][y] = 0;    // force "not moving" for "crumbled sand"
 
-  if (Store[x][y] == EL_ACID)  /* element is moving into acid pool */
+  if (Store[x][y] == EL_ACID)  // element is moving into acid pool
   {
-    element = Feld[newx][newy] = EL_ACID;
+    element = Tile[newx][newy] = EL_ACID;
   }
   else if (element == EL_MOLE)
   {
-    Feld[x][y] = EL_SAND;
+    Tile[x][y] = EL_SAND;
 
     TEST_DrawLevelFieldCrumbledNeighbours(x, y);
   }
   else if (element == EL_QUICKSAND_FILLING)
   {
-    element = Feld[newx][newy] = get_next_element(element);
+    element = Tile[newx][newy] = get_next_element(element);
     Store[newx][newy] = Store[x][y];
   }
   else if (element == EL_QUICKSAND_EMPTYING)
   {
-    Feld[x][y] = get_next_element(element);
-    element = Feld[newx][newy] = Store[x][y];
+    Tile[x][y] = get_next_element(element);
+    element = Tile[newx][newy] = Store[x][y];
   }
   else if (element == EL_QUICKSAND_FAST_FILLING)
   {
-    element = Feld[newx][newy] = get_next_element(element);
+    element = Tile[newx][newy] = get_next_element(element);
     Store[newx][newy] = Store[x][y];
   }
   else if (element == EL_QUICKSAND_FAST_EMPTYING)
   {
-    Feld[x][y] = get_next_element(element);
-    element = Feld[newx][newy] = Store[x][y];
+    Tile[x][y] = get_next_element(element);
+    element = Tile[newx][newy] = Store[x][y];
   }
   else if (element == EL_MAGIC_WALL_FILLING)
   {
-    element = Feld[newx][newy] = get_next_element(element);
+    element = Tile[newx][newy] = get_next_element(element);
     if (!game.magic_wall_active)
-      element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD;
+      element = Tile[newx][newy] = EL_MAGIC_WALL_DEAD;
     Store[newx][newy] = Store[x][y];
   }
   else if (element == EL_MAGIC_WALL_EMPTYING)
   {
-    Feld[x][y] = get_next_element(element);
+    Tile[x][y] = get_next_element(element);
     if (!game.magic_wall_active)
-      Feld[x][y] = EL_MAGIC_WALL_DEAD;
-    element = Feld[newx][newy] = Store[x][y];
+      Tile[x][y] = EL_MAGIC_WALL_DEAD;
+    element = Tile[newx][newy] = Store[x][y];
 
     InitField(newx, newy, FALSE);
   }
   else if (element == EL_BD_MAGIC_WALL_FILLING)
   {
-    element = Feld[newx][newy] = get_next_element(element);
+    element = Tile[newx][newy] = get_next_element(element);
     if (!game.magic_wall_active)
-      element = Feld[newx][newy] = EL_BD_MAGIC_WALL_DEAD;
+      element = Tile[newx][newy] = EL_BD_MAGIC_WALL_DEAD;
     Store[newx][newy] = Store[x][y];
   }
   else if (element == EL_BD_MAGIC_WALL_EMPTYING)
   {
-    Feld[x][y] = get_next_element(element);
+    Tile[x][y] = get_next_element(element);
     if (!game.magic_wall_active)
-      Feld[x][y] = EL_BD_MAGIC_WALL_DEAD;
-    element = Feld[newx][newy] = Store[x][y];
+      Tile[x][y] = EL_BD_MAGIC_WALL_DEAD;
+    element = Tile[newx][newy] = Store[x][y];
 
     InitField(newx, newy, FALSE);
   }
   else if (element == EL_DC_MAGIC_WALL_FILLING)
   {
-    element = Feld[newx][newy] = get_next_element(element);
+    element = Tile[newx][newy] = get_next_element(element);
     if (!game.magic_wall_active)
-      element = Feld[newx][newy] = EL_DC_MAGIC_WALL_DEAD;
+      element = Tile[newx][newy] = EL_DC_MAGIC_WALL_DEAD;
     Store[newx][newy] = Store[x][y];
   }
   else if (element == EL_DC_MAGIC_WALL_EMPTYING)
   {
-    Feld[x][y] = get_next_element(element);
+    Tile[x][y] = get_next_element(element);
     if (!game.magic_wall_active)
-      Feld[x][y] = EL_DC_MAGIC_WALL_DEAD;
-    element = Feld[newx][newy] = Store[x][y];
+      Tile[x][y] = EL_DC_MAGIC_WALL_DEAD;
+    element = Tile[newx][newy] = Store[x][y];
 
     InitField(newx, newy, FALSE);
   }
   else if (element == EL_AMOEBA_DROPPING)
   {
-    Feld[x][y] = get_next_element(element);
-    element = Feld[newx][newy] = Store[x][y];
+    Tile[x][y] = get_next_element(element);
+    element = Tile[newx][newy] = Store[x][y];
   }
   else if (element == EL_SOKOBAN_OBJECT)
   {
     if (Back[x][y])
-      Feld[x][y] = Back[x][y];
+      Tile[x][y] = Back[x][y];
 
     if (Back[newx][newy])
-      Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL;
+      Tile[newx][newy] = EL_SOKOBAN_FIELD_FULL;
 
     Back[x][y] = Back[newx][newy] = 0;
   }
@@ -8350,7 +8546,7 @@ void ContinueMoving(int x, int y)
 
   if (CAN_CHANGE_OR_HAS_ACTION(element))
   {
-    /* copy element change control values to new field */
+    // copy element change control values to new field
     ChangeDelay[newx][newy] = ChangeDelay[x][y];
     ChangePage[newx][newy]  = ChangePage[x][y];
     ChangeCount[newx][newy] = ChangeCount[x][y];
@@ -8366,41 +8562,41 @@ void ContinueMoving(int x, int y)
 
   CustomValue[x][y] = 0;
 
-  /* copy animation control values to new field */
+  // copy animation control values to new field
   GfxFrame[newx][newy]  = GfxFrame[x][y];
-  GfxRandom[newx][newy] = GfxRandom[x][y];     /* keep same random value */
-  GfxAction[newx][newy] = GfxAction[x][y];     /* keep action one frame  */
-  GfxDir[newx][newy]    = GfxDir[x][y];                /* keep element direction */
+  GfxRandom[newx][newy] = GfxRandom[x][y];     // keep same random value
+  GfxAction[newx][newy] = GfxAction[x][y];     // keep action one frame
+  GfxDir[newx][newy]    = GfxDir[x][y];                // keep element direction
 
   Pushed[x][y] = Pushed[newx][newy] = FALSE;
 
-  /* some elements can leave other elements behind after moving */
+  // some elements can leave other elements behind after moving
   if (ei->move_leave_element != EL_EMPTY &&
       (ei->move_leave_type == LEAVE_TYPE_UNLIMITED || stored != EL_EMPTY) &&
       (!IS_PLAYER(x, y) || IS_WALKABLE(ei->move_leave_element)))
   {
     int move_leave_element = ei->move_leave_element;
 
-    /* this makes it possible to leave the removed element again */
+    // this makes it possible to leave the removed element again
     if (ei->move_leave_element == EL_TRIGGER_ELEMENT)
       move_leave_element = (stored == EL_ACID ? EL_EMPTY : stored);
 
-    Feld[x][y] = move_leave_element;
+    Tile[x][y] = move_leave_element;
 
-    if (element_info[Feld[x][y]].move_direction_initial == MV_START_PREVIOUS)
+    if (element_info[Tile[x][y]].move_direction_initial == MV_START_PREVIOUS)
       MovDir[x][y] = direction;
 
     InitField(x, y, FALSE);
 
-    if (GFX_CRUMBLED(Feld[x][y]))
+    if (GFX_CRUMBLED(Tile[x][y]))
       TEST_DrawLevelFieldCrumbledNeighbours(x, y);
 
     if (ELEM_IS_PLAYER(move_leave_element))
       RelocatePlayer(x, y, move_leave_element);
   }
 
-  /* do this after checking for left-behind element */
-  ResetGfxAnimation(x, y);     /* reset animation values for old field */
+  // do this after checking for left-behind element
+  ResetGfxAnimation(x, y);     // reset animation values for old field
 
   if (!CAN_MOVE(element) ||
       (CAN_FALL(element) && direction == MV_DOWN &&
@@ -8412,15 +8608,15 @@ void ContinueMoving(int x, int y)
   TEST_DrawLevelField(x, y);
   TEST_DrawLevelField(newx, newy);
 
-  Stop[newx][newy] = TRUE;     /* ignore this element until the next frame */
+  Stop[newx][newy] = TRUE;     // ignore this element until the next frame
 
-  /* prevent pushed element from moving on in pushed direction */
+  // prevent pushed element from moving on in pushed direction
   if (pushed_by_player && CAN_MOVE(element) &&
       element_info[element].move_pattern & MV_ANY_DIRECTION &&
       !(element_info[element].move_pattern & direction))
     TurnRound(newx, newy);
 
-  /* prevent elements on conveyor belt from moving on in last direction */
+  // prevent elements on conveyor belt from moving on in last direction
   if (pushed_by_conveyor && CAN_FALL(element) &&
       direction & MV_HORIZONTAL)
     MovDir[newx][newy] = 0;
@@ -8442,7 +8638,7 @@ void ContinueMoving(int x, int y)
       CheckImpact[newx][newy] = CHECK_DELAY_IMPACT;
   }
 
-  if (DONT_TOUCH(element))     /* object may be nasty to player or others */
+  if (DONT_TOUCH(element))     // object may be nasty to player or others
   {
     TestIfBadThingTouchesPlayer(newx, newy);
     TestIfBadThingTouchesFriend(newx, newy);
@@ -8458,7 +8654,7 @@ void ContinueMoving(int x, int y)
     TestIfGoodThingGetsHitByBadThing(newx, newy, direction);
   }
 
-  /* give the player one last chance (one more frame) to move away */
+  // give the player one last chance (one more frame) to move away
   if (CAN_FALL(element) && direction == MV_DOWN &&
       (last_line || (!IS_FREE(x, newy + 1) &&
                     (!IS_PLAYER(x, newy + 1) ||
@@ -8476,12 +8672,12 @@ void ContinueMoving(int x, int y)
                                        player->index_bit, push_side);
   }
 
-  if (element == EL_EMC_ANDROID && pushed_by_player)   /* make another move */
+  if (element == EL_EMC_ANDROID && pushed_by_player)   // make another move
     MovDelay[newx][newy] = 1;
 
   CheckTriggeredElementChangeBySide(x, y, element, CE_MOVE_OF_X, direction);
 
-  TestIfElementTouchesCustomElement(x, y);     /* empty or new element */
+  TestIfElementTouchesCustomElement(x, y);     // empty or new element
   TestIfElementHitsCustomElement(newx, newy, direction);
   TestIfPlayerTouchesCustomElement(newx, newy);
   TestIfElementTouchesCustomElement(newx, newy);
@@ -8492,10 +8688,10 @@ void ContinueMoving(int x, int y)
                             MV_DIR_OPPOSITE(direction));
 }
 
-int AmoebeNachbarNr(int ax, int ay)
+int AmoebaNeighbourNr(int ax, int ay)
 {
   int i;
-  int element = Feld[ax][ay];
+  int element = Tile[ax][ay];
   int group_nr = 0;
   static int xy[4][2] =
   {
@@ -8513,14 +8709,14 @@ int AmoebeNachbarNr(int ax, int ay)
     if (!IN_LEV_FIELD(x, y))
       continue;
 
-    if (Feld[x][y] == element && AmoebaNr[x][y] > 0)
+    if (Tile[x][y] == element && AmoebaNr[x][y] > 0)
       group_nr = AmoebaNr[x][y];
   }
 
   return group_nr;
 }
 
-static void AmoebenVereinigen(int ax, int ay)
+static void AmoebaMerge(int ax, int ay)
 {
   int i, x, y, xx, yy;
   int new_group_nr = AmoebaNr[ax][ay];
@@ -8543,9 +8739,9 @@ static void AmoebenVereinigen(int ax, int ay)
     if (!IN_LEV_FIELD(x, y))
       continue;
 
-    if ((Feld[x][y] == EL_AMOEBA_FULL ||
-        Feld[x][y] == EL_BD_AMOEBA ||
-        Feld[x][y] == EL_AMOEBA_DEAD) &&
+    if ((Tile[x][y] == EL_AMOEBA_FULL ||
+        Tile[x][y] == EL_BD_AMOEBA ||
+        Tile[x][y] == EL_AMOEBA_DEAD) &&
        AmoebaNr[x][y] != new_group_nr)
     {
       int old_group_nr = AmoebaNr[x][y];
@@ -8567,29 +8763,30 @@ static void AmoebenVereinigen(int ax, int ay)
   }
 }
 
-void AmoebeUmwandeln(int ax, int ay)
+void AmoebaToDiamond(int ax, int ay)
 {
   int i, x, y;
 
-  if (Feld[ax][ay] == EL_AMOEBA_DEAD)
+  if (Tile[ax][ay] == EL_AMOEBA_DEAD)
   {
     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");
+      Debug("game:playing:AmoebaToDiamond", "ax = %d, ay = %d", ax, ay);
+      Debug("game:playing:AmoebaToDiamond", "This should never happen!");
+
       return;
     }
 #endif
 
     SCAN_PLAYFIELD(x, y)
     {
-      if (Feld[x][y] == EL_AMOEBA_DEAD && AmoebaNr[x][y] == group_nr)
+      if (Tile[x][y] == EL_AMOEBA_DEAD && AmoebaNr[x][y] == group_nr)
       {
        AmoebaNr[x][y] = 0;
-       Feld[x][y] = EL_AMOEBA_TO_DIAMOND;
+       Tile[x][y] = EL_AMOEBA_TO_DIAMOND;
       }
     }
 
@@ -8616,7 +8813,7 @@ void AmoebeUmwandeln(int ax, int ay)
       if (!IN_LEV_FIELD(x, y))
        continue;
 
-      if (Feld[x][y] == EL_AMOEBA_TO_DIAMOND)
+      if (Tile[x][y] == EL_AMOEBA_TO_DIAMOND)
       {
        PlayLevelSound(x, y, (IS_GEM(level.amoeba_content) ?
                              SND_AMOEBA_TURNING_TO_GEM :
@@ -8627,7 +8824,7 @@ void AmoebeUmwandeln(int ax, int ay)
   }
 }
 
-static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
+static void AmoebaToDiamondBD(int ax, int ay, int new_element)
 {
   int x, y;
   int group_nr = AmoebaNr[ax][ay];
@@ -8636,8 +8833,9 @@ static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
 #ifdef DEBUG
   if (group_nr == 0)
   {
-    printf("AmoebeUmwandelnBD(): ax = %d, ay = %d\n", ax, ay);
-    printf("AmoebeUmwandelnBD(): This should never happen!\n");
+    Debug("game:playing:AmoebaToDiamondBD", "ax = %d, ay = %d", ax, ay);
+    Debug("game:playing:AmoebaToDiamondBD", "This should never happen!");
+
     return;
   }
 #endif
@@ -8645,12 +8843,12 @@ static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
   SCAN_PLAYFIELD(x, y)
   {
     if (AmoebaNr[x][y] == group_nr &&
-       (Feld[x][y] == EL_AMOEBA_DEAD ||
-        Feld[x][y] == EL_BD_AMOEBA ||
-        Feld[x][y] == EL_AMOEBA_GROWING))
+       (Tile[x][y] == EL_AMOEBA_DEAD ||
+        Tile[x][y] == EL_BD_AMOEBA ||
+        Tile[x][y] == EL_AMOEBA_GROWING))
     {
       AmoebaNr[x][y] = 0;
-      Feld[x][y] = new_element;
+      Tile[x][y] = new_element;
       InitField(x, y, FALSE);
       TEST_DrawLevelField(x, y);
       done = TRUE;
@@ -8663,12 +8861,12 @@ static void AmoebeUmwandelnBD(int ax, int ay, int new_element)
                            SND_BD_AMOEBA_TURNING_TO_GEM));
 }
 
-static void AmoebeWaechst(int x, int y)
+static void AmoebaGrowing(int x, int y)
 {
   static unsigned int sound_delay = 0;
   static unsigned int sound_delay_value = 0;
 
-  if (!MovDelay[x][y])         /* start new growing cycle */
+  if (!MovDelay[x][y])         // start new growing cycle
   {
     MovDelay[x][y] = 7;
 
@@ -8679,7 +8877,7 @@ static void AmoebeWaechst(int x, int y)
     }
   }
 
-  if (MovDelay[x][y])          /* wait some time before growing bigger */
+  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)))
@@ -8692,19 +8890,19 @@ static void AmoebeWaechst(int x, int y)
 
     if (!MovDelay[x][y])
     {
-      Feld[x][y] = Store[x][y];
+      Tile[x][y] = Store[x][y];
       Store[x][y] = 0;
       TEST_DrawLevelField(x, y);
     }
   }
 }
 
-static void AmoebaDisappearing(int x, int y)
+static void AmoebaShrinking(int x, int y)
 {
   static unsigned int sound_delay = 0;
   static unsigned int sound_delay_value = 0;
 
-  if (!MovDelay[x][y])         /* start new shrinking cycle */
+  if (!MovDelay[x][y])         // start new shrinking cycle
   {
     MovDelay[x][y] = 7;
 
@@ -8712,7 +8910,7 @@ static void AmoebaDisappearing(int x, int y)
       sound_delay_value = 30;
   }
 
-  if (MovDelay[x][y])          /* wait some time before shrinking */
+  if (MovDelay[x][y])          // wait some time before shrinking
   {
     MovDelay[x][y]--;
     if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
@@ -8725,20 +8923,20 @@ static void AmoebaDisappearing(int x, int y)
 
     if (!MovDelay[x][y])
     {
-      Feld[x][y] = EL_EMPTY;
+      Tile[x][y] = EL_EMPTY;
       TEST_DrawLevelField(x, y);
 
-      /* don't let mole enter this field in this cycle;
-        (give priority to objects falling to this field from above) */
+      // don't let mole enter this field in this cycle;
+      // (give priority to objects falling to this field from above)
       Stop[x][y] = TRUE;
     }
   }
 }
 
-static void AmoebeAbleger(int ax, int ay)
+static void AmoebaReproduce(int ax, int ay)
 {
   int i;
-  int element = Feld[ax][ay];
+  int element = Tile[ax][ay];
   int graphic = el2img(element);
   int newax = ax, neway = ay;
   boolean can_drop = (element == EL_AMOEBA_WET || element == EL_EMC_DRIPPER);
@@ -8752,7 +8950,7 @@ static void AmoebeAbleger(int ax, int ay)
 
   if (!level.amoeba_speed && element != EL_EMC_DRIPPER)
   {
-    Feld[ax][ay] = EL_AMOEBA_DEAD;
+    Tile[ax][ay] = EL_AMOEBA_DEAD;
     TEST_DrawLevelField(ax, ay);
     return;
   }
@@ -8760,17 +8958,17 @@ static void AmoebeAbleger(int ax, int ay)
   if (IS_ANIMATED(graphic))
     DrawLevelGraphicAnimationIfNeeded(ax, ay, graphic);
 
-  if (!MovDelay[ax][ay])       /* start making new amoeba field */
+  if (!MovDelay[ax][ay])       // start making new amoeba field
     MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.amoeba_speed));
 
-  if (MovDelay[ax][ay])                /* wait some time before making new amoeba */
+  if (MovDelay[ax][ay])                // wait some time before making new amoeba
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
       return;
   }
 
-  if (can_drop)                        /* EL_AMOEBA_WET or EL_EMC_DRIPPER */
+  if (can_drop)                        // EL_AMOEBA_WET or EL_EMC_DRIPPER
   {
     int start = RND(4);
     int x = ax + xy[start][0];
@@ -8780,9 +8978,9 @@ static void AmoebeAbleger(int ax, int ay)
       return;
 
     if (IS_FREE(x, y) ||
-       CAN_GROW_INTO(Feld[x][y]) ||
-       Feld[x][y] == EL_QUICKSAND_EMPTY ||
-       Feld[x][y] == EL_QUICKSAND_FAST_EMPTY)
+       CAN_GROW_INTO(Tile[x][y]) ||
+       Tile[x][y] == EL_QUICKSAND_EMPTY ||
+       Tile[x][y] == EL_QUICKSAND_FAST_EMPTY)
     {
       newax = x;
       neway = y;
@@ -8791,7 +8989,7 @@ static void AmoebeAbleger(int ax, int ay)
     if (newax == ax && neway == ay)
       return;
   }
-  else                         /* normal or "filled" (BD style) amoeba */
+  else                         // normal or "filled" (BD style) amoeba
   {
     int start = RND(4);
     boolean waiting_for_player = FALSE;
@@ -8806,9 +9004,9 @@ static void AmoebeAbleger(int ax, int ay)
        continue;
 
       if (IS_FREE(x, y) ||
-         CAN_GROW_INTO(Feld[x][y]) ||
-         Feld[x][y] == EL_QUICKSAND_EMPTY ||
-         Feld[x][y] == EL_QUICKSAND_FAST_EMPTY)
+         CAN_GROW_INTO(Tile[x][y]) ||
+         Tile[x][y] == EL_QUICKSAND_EMPTY ||
+         Tile[x][y] == EL_QUICKSAND_FAST_EMPTY)
       {
        newax = x;
        neway = y;
@@ -8818,35 +9016,37 @@ static void AmoebeAbleger(int ax, int ay)
        waiting_for_player = TRUE;
     }
 
-    if (newax == ax && neway == ay)            /* amoeba cannot grow */
+    if (newax == ax && neway == ay)            // amoeba cannot grow
     {
       if (i == 4 && (!waiting_for_player || element == EL_BD_AMOEBA))
       {
-       Feld[ax][ay] = EL_AMOEBA_DEAD;
+       Tile[ax][ay] = EL_AMOEBA_DEAD;
        TEST_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_AMOEBA_FULL)
-           AmoebeUmwandeln(ax, ay);
+           AmoebaToDiamond(ax, ay);
          else if (element == EL_BD_AMOEBA)
-           AmoebeUmwandelnBD(ax, ay, level.amoeba_content);
+           AmoebaToDiamondBD(ax, ay, level.amoeba_content);
        }
       }
       return;
     }
     else if (element == EL_AMOEBA_FULL || element == EL_BD_AMOEBA)
     {
-      /* amoeba gets larger by growing in some direction */
+      // 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");
+    Debug("game:playing:AmoebaReproduce", "newax = %d, neway = %d",
+         newax, neway);
+    Debug("game:playing:AmoebaReproduce", "This should never happen!");
+
     return;
   }
 #endif
@@ -8855,12 +9055,12 @@ static void AmoebeAbleger(int ax, int ay)
       AmoebaCnt[new_group_nr]++;
       AmoebaCnt2[new_group_nr]++;
 
-      /* if amoeba touches other amoeba(s) after growing, unify them */
-      AmoebenVereinigen(newax, neway);
+      // if amoeba touches other amoeba(s) after growing, unify them
+      AmoebaMerge(newax, neway);
 
       if (element == EL_BD_AMOEBA && AmoebaCnt2[new_group_nr] >= 200)
       {
-       AmoebeUmwandelnBD(newax, neway, EL_BD_ROCK);
+       AmoebaToDiamondBD(newax, neway, EL_BD_ROCK);
        return;
       }
     }
@@ -8869,19 +9069,19 @@ static void AmoebeAbleger(int ax, int ay)
   if (!can_drop || neway < ay || !IS_FREE(newax, neway) ||
       (neway == lev_fieldy - 1 && newax != ax))
   {
-    Feld[newax][neway] = EL_AMOEBA_GROWING;    /* creation of new amoeba */
+    Tile[newax][neway] = EL_AMOEBA_GROWING;    // creation of new amoeba
     Store[newax][neway] = element;
   }
   else if (neway == ay || element == EL_EMC_DRIPPER)
   {
-    Feld[newax][neway] = EL_AMOEBA_DROP;       /* drop left/right of amoeba */
+    Tile[newax][neway] = EL_AMOEBA_DROP;       // drop left/right of amoeba
 
     PlayLevelSoundAction(newax, neway, ACTION_GROWING);
   }
   else
   {
-    InitMovingField(ax, ay, MV_DOWN);          /* drop dripping from amoeba */
-    Feld[ax][ay] = EL_AMOEBA_DROPPING;
+    InitMovingField(ax, ay, MV_DOWN);          // drop dripping from amoeba
+    Tile[ax][ay] = EL_AMOEBA_DROPPING;
     Store[ax][ay] = EL_AMOEBA_DROP;
     ContinueMoving(ax, ay);
     return;
@@ -8894,7 +9094,7 @@ static void Life(int ax, int ay)
 {
   int x1, y1, x2, y2;
   int life_time = 40;
-  int element = Feld[ax][ay];
+  int element = Tile[ax][ay];
   int graphic = el2img(element);
   int *life_parameter = (element == EL_GAME_OF_LIFE ? level.game_of_life :
                         level.biomaze);
@@ -8906,10 +9106,10 @@ static void Life(int ax, int ay)
   if (Stop[ax][ay])
     return;
 
-  if (!MovDelay[ax][ay])       /* start new "game of life" cycle */
+  if (!MovDelay[ax][ay])       // start new "game of life" cycle
     MovDelay[ax][ay] = life_time;
 
-  if (MovDelay[ax][ay])                /* wait some time before next cycle */
+  if (MovDelay[ax][ay])                // wait some time before next cycle
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
@@ -8919,7 +9119,7 @@ static void Life(int ax, int ay)
   for (y1 = -1; y1 < 2; y1++) for (x1 = -1; x1 < 2; x1++)
   {
     int xx = ax+x1, yy = ay+y1;
-    int old_element = Feld[xx][yy];
+    int old_element = Tile[xx][yy];
     int num_neighbours = 0;
 
     if (!IN_LEV_FIELD(xx, yy))
@@ -8937,7 +9137,7 @@ static void Life(int ax, int ay)
 
       if (level.use_life_bugs)
        is_neighbour =
-         (((Feld[x][y] == element || is_player_cell) && !Stop[x][y]) ||
+         (((Tile[x][y] == element || is_player_cell) && !Stop[x][y]) ||
           (IS_FREE(x, y)                             &&  Stop[x][y]));
       else
        is_neighbour =
@@ -8954,26 +9154,26 @@ static void Life(int ax, int ay)
     else
       is_free = (IS_FREE(xx, yy) && Last[xx][yy] == EL_EMPTY);
 
-    if (xx == ax && yy == ay)          /* field in the middle */
+    if (xx == ax && yy == ay)          // field in the middle
     {
       if (num_neighbours < life_parameter[0] ||
          num_neighbours > life_parameter[1])
       {
-       Feld[xx][yy] = EL_EMPTY;
-       if (Feld[xx][yy] != old_element)
+       Tile[xx][yy] = EL_EMPTY;
+       if (Tile[xx][yy] != old_element)
          TEST_DrawLevelField(xx, yy);
        Stop[xx][yy] = TRUE;
        changed = TRUE;
       }
     }
-    else if (is_free || CAN_GROW_INTO(Feld[xx][yy]))
-    {                                  /* free border field */
+    else if (is_free || CAN_GROW_INTO(Tile[xx][yy]))
+    {                                  // free border field
       if (num_neighbours >= life_parameter[2] &&
          num_neighbours <= life_parameter[3])
       {
-       Feld[xx][yy] = element;
+       Tile[xx][yy] = element;
        MovDelay[xx][yy] = (element == EL_GAME_OF_LIFE ? 0 : life_time-1);
-       if (Feld[xx][yy] != old_element)
+       if (Tile[xx][yy] != old_element)
          TEST_DrawLevelField(xx, yy);
        Stop[xx][yy] = TRUE;
        changed = TRUE;
@@ -8998,10 +9198,11 @@ static void RunRobotWheel(int x, int y)
 
 static void StopRobotWheel(int x, int y)
 {
-  if (ZX == x && ZY == y)
+  if (game.robot_wheel_x == x &&
+      game.robot_wheel_y == y)
   {
-    ZX = ZY = -1;
-
+    game.robot_wheel_x = -1;
+    game.robot_wheel_y = -1;
     game.robot_wheel_active = FALSE;
   }
 }
@@ -9027,7 +9228,7 @@ static void ActivateMagicBall(int bx, int by)
 
   if (level.ball_random)
   {
-    int pos_border = RND(8);   /* select one of the eight border elements */
+    int pos_border = RND(8);   // select one of the eight border elements
     int pos_content = (pos_border > 3 ? pos_border + 1 : pos_border);
     int xx = pos_content % 3;
     int yy = pos_content / 3;
@@ -9035,7 +9236,7 @@ static void ActivateMagicBall(int bx, int by)
     x = bx - 1 + xx;
     y = by - 1 + yy;
 
-    if (IN_LEV_FIELD(x, y) && Feld[x][y] == EL_EMPTY)
+    if (IN_LEV_FIELD(x, y) && Tile[x][y] == EL_EMPTY)
       CreateField(x, y, level.ball_content[game.ball_content_nr].e[xx][yy]);
   }
   else
@@ -9045,7 +9246,7 @@ static void ActivateMagicBall(int bx, int by)
       int xx = x - bx + 1;
       int yy = y - by + 1;
 
-      if (IN_LEV_FIELD(x, y) && Feld[x][y] == EL_EMPTY)
+      if (IN_LEV_FIELD(x, y) && Tile[x][y] == EL_EMPTY)
        CreateField(x, y, level.ball_content[game.ball_content_nr].e[xx][yy]);
     }
   }
@@ -9055,11 +9256,12 @@ static void ActivateMagicBall(int bx, int by)
 
 static void CheckExit(int x, int y)
 {
-  if (local_player->gems_still_needed > 0 ||
-      local_player->sokobanfields_still_needed > 0 ||
-      local_player->lights_still_needed > 0)
+  if (game.gems_still_needed > 0 ||
+      game.sokoban_fields_still_needed > 0 ||
+      game.sokoban_objects_still_needed > 0 ||
+      game.lights_still_needed > 0)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
     int graphic = el2img(element);
 
     if (IS_ANIMATED(graphic))
@@ -9068,21 +9270,23 @@ static void CheckExit(int x, int y)
     return;
   }
 
-  if (AllPlayersGone)  /* do not re-open exit door closed after last player */
+  // do not re-open exit door closed after last player
+  if (game.all_players_gone)
     return;
 
-  Feld[x][y] = EL_EXIT_OPENING;
+  Tile[x][y] = EL_EXIT_OPENING;
 
   PlayLevelSoundNearest(x, y, SND_CLASS_EXIT_OPENING);
 }
 
 static void CheckExitEM(int x, int y)
 {
-  if (local_player->gems_still_needed > 0 ||
-      local_player->sokobanfields_still_needed > 0 ||
-      local_player->lights_still_needed > 0)
+  if (game.gems_still_needed > 0 ||
+      game.sokoban_fields_still_needed > 0 ||
+      game.sokoban_objects_still_needed > 0 ||
+      game.lights_still_needed > 0)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
     int graphic = el2img(element);
 
     if (IS_ANIMATED(graphic))
@@ -9091,21 +9295,23 @@ static void CheckExitEM(int x, int y)
     return;
   }
 
-  if (AllPlayersGone)  /* do not re-open exit door closed after last player */
+  // do not re-open exit door closed after last player
+  if (game.all_players_gone)
     return;
 
-  Feld[x][y] = EL_EM_EXIT_OPENING;
+  Tile[x][y] = EL_EM_EXIT_OPENING;
 
   PlayLevelSoundNearest(x, y, SND_CLASS_EM_EXIT_OPENING);
 }
 
 static void CheckExitSteel(int x, int y)
 {
-  if (local_player->gems_still_needed > 0 ||
-      local_player->sokobanfields_still_needed > 0 ||
-      local_player->lights_still_needed > 0)
+  if (game.gems_still_needed > 0 ||
+      game.sokoban_fields_still_needed > 0 ||
+      game.sokoban_objects_still_needed > 0 ||
+      game.lights_still_needed > 0)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
     int graphic = el2img(element);
 
     if (IS_ANIMATED(graphic))
@@ -9114,21 +9320,23 @@ static void CheckExitSteel(int x, int y)
     return;
   }
 
-  if (AllPlayersGone)  /* do not re-open exit door closed after last player */
+  // do not re-open exit door closed after last player
+  if (game.all_players_gone)
     return;
 
-  Feld[x][y] = EL_STEEL_EXIT_OPENING;
+  Tile[x][y] = EL_STEEL_EXIT_OPENING;
 
   PlayLevelSoundNearest(x, y, SND_CLASS_STEEL_EXIT_OPENING);
 }
 
 static void CheckExitSteelEM(int x, int y)
 {
-  if (local_player->gems_still_needed > 0 ||
-      local_player->sokobanfields_still_needed > 0 ||
-      local_player->lights_still_needed > 0)
+  if (game.gems_still_needed > 0 ||
+      game.sokoban_fields_still_needed > 0 ||
+      game.sokoban_objects_still_needed > 0 ||
+      game.lights_still_needed > 0)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
     int graphic = el2img(element);
 
     if (IS_ANIMATED(graphic))
@@ -9137,19 +9345,20 @@ static void CheckExitSteelEM(int x, int y)
     return;
   }
 
-  if (AllPlayersGone)  /* do not re-open exit door closed after last player */
+  // do not re-open exit door closed after last player
+  if (game.all_players_gone)
     return;
 
-  Feld[x][y] = EL_EM_STEEL_EXIT_OPENING;
+  Tile[x][y] = EL_EM_STEEL_EXIT_OPENING;
 
   PlayLevelSoundNearest(x, y, SND_CLASS_EM_STEEL_EXIT_OPENING);
 }
 
 static void CheckExitSP(int x, int y)
 {
-  if (local_player->gems_still_needed > 0)
+  if (game.gems_still_needed > 0)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
     int graphic = el2img(element);
 
     if (IS_ANIMATED(graphic))
@@ -9158,10 +9367,11 @@ static void CheckExitSP(int x, int y)
     return;
   }
 
-  if (AllPlayersGone)  /* do not re-open exit door closed after last player */
+  // do not re-open exit door closed after last player
+  if (game.all_players_gone)
     return;
 
-  Feld[x][y] = EL_SP_EXIT_OPENING;
+  Tile[x][y] = EL_SP_EXIT_OPENING;
 
   PlayLevelSoundNearest(x, y, SND_CLASS_SP_EXIT_OPENING);
 }
@@ -9172,11 +9382,11 @@ static void CloseAllOpenTimegates(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    int element = Feld[x][y];
+    int element = Tile[x][y];
 
     if (element == EL_TIMEGATE_OPEN || element == EL_TIMEGATE_OPENING)
     {
-      Feld[x][y] = EL_TIMEGATE_CLOSING;
+      Tile[x][y] = EL_TIMEGATE_CLOSING;
 
       PlayLevelSoundAction(x, y, ACTION_CLOSING);
     }
@@ -9188,17 +9398,17 @@ static void DrawTwinkleOnField(int x, int y)
   if (!IN_SCR_FIELD(SCREENX(x), SCREENY(y)) || IS_MOVING(x, y))
     return;
 
-  if (Feld[x][y] == EL_BD_DIAMOND)
+  if (Tile[x][y] == EL_BD_DIAMOND)
     return;
 
-  if (MovDelay[x][y] == 0)     /* next animation frame */
+  if (MovDelay[x][y] == 0)     // next animation frame
     MovDelay[x][y] = 11 * !GetSimpleRandom(500);
 
-  if (MovDelay[x][y] != 0)     /* wait some time before next frame */
+  if (MovDelay[x][y] != 0)     // wait some time before next frame
   {
     MovDelay[x][y]--;
 
-    DrawLevelElementAnimation(x, y, Feld[x][y]);
+    DrawLevelElementAnimation(x, y, Tile[x][y]);
 
     if (MovDelay[x][y] != 0)
     {
@@ -9214,16 +9424,16 @@ static void MauerWaechst(int x, int y)
 {
   int delay = 6;
 
-  if (!MovDelay[x][y])         /* next animation frame */
+  if (!MovDelay[x][y])         // next animation frame
     MovDelay[x][y] = 3 * delay;
 
-  if (MovDelay[x][y])          /* wait some time before next frame */
+  if (MovDelay[x][y])          // wait some time before next frame
   {
     MovDelay[x][y]--;
 
     if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
     {
-      int graphic = el_dir2img(Feld[x][y], GfxDir[x][y]);
+      int graphic = el_dir2img(Tile[x][y], GfxDir[x][y]);
       int frame = getGraphicAnimationFrame(graphic, 17 - MovDelay[x][y]);
 
       DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
@@ -9233,26 +9443,26 @@ static void MauerWaechst(int x, int y)
     {
       if (MovDir[x][y] == MV_LEFT)
       {
-       if (IN_LEV_FIELD(x - 1, y) && IS_WALL(Feld[x - 1][y]))
+       if (IN_LEV_FIELD(x - 1, y) && IS_WALL(Tile[x - 1][y]))
          TEST_DrawLevelField(x - 1, y);
       }
       else if (MovDir[x][y] == MV_RIGHT)
       {
-       if (IN_LEV_FIELD(x + 1, y) && IS_WALL(Feld[x + 1][y]))
+       if (IN_LEV_FIELD(x + 1, y) && IS_WALL(Tile[x + 1][y]))
          TEST_DrawLevelField(x + 1, y);
       }
       else if (MovDir[x][y] == MV_UP)
       {
-       if (IN_LEV_FIELD(x, y - 1) && IS_WALL(Feld[x][y - 1]))
+       if (IN_LEV_FIELD(x, y - 1) && IS_WALL(Tile[x][y - 1]))
          TEST_DrawLevelField(x, y - 1);
       }
       else
       {
-       if (IN_LEV_FIELD(x, y + 1) && IS_WALL(Feld[x][y + 1]))
+       if (IN_LEV_FIELD(x, y + 1) && IS_WALL(Tile[x][y + 1]))
          TEST_DrawLevelField(x, y + 1);
       }
 
-      Feld[x][y] = Store[x][y];
+      Tile[x][y] = Store[x][y];
       Store[x][y] = 0;
       GfxDir[x][y] = MovDir[x][y] = MV_NONE;
       TEST_DrawLevelField(x, y);
@@ -9262,7 +9472,7 @@ static void MauerWaechst(int x, int y)
 
 static void MauerAbleger(int ax, int ay)
 {
-  int element = Feld[ax][ay];
+  int element = Tile[ax][ay];
   int graphic = el2img(element);
   boolean oben_frei = FALSE, unten_frei = FALSE;
   boolean links_frei = FALSE, rechts_frei = FALSE;
@@ -9273,10 +9483,10 @@ static void MauerAbleger(int ax, int ay)
   if (IS_ANIMATED(graphic))
     DrawLevelGraphicAnimationIfNeeded(ax, ay, graphic);
 
-  if (!MovDelay[ax][ay])       /* start building new wall */
+  if (!MovDelay[ax][ay])       // start building new wall
     MovDelay[ax][ay] = 6;
 
-  if (MovDelay[ax][ay])                /* wait some time before building new wall */
+  if (MovDelay[ax][ay])                // wait some time before building new wall
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
@@ -9297,7 +9507,7 @@ static void MauerAbleger(int ax, int ay)
   {
     if (oben_frei)
     {
-      Feld[ax][ay-1] = EL_EXPANDABLE_WALL_GROWING;
+      Tile[ax][ay-1] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax][ay-1] = element;
       GfxDir[ax][ay-1] = MovDir[ax][ay-1] = MV_UP;
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1)))
@@ -9307,7 +9517,7 @@ static void MauerAbleger(int ax, int ay)
     }
     if (unten_frei)
     {
-      Feld[ax][ay+1] = EL_EXPANDABLE_WALL_GROWING;
+      Tile[ax][ay+1] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax][ay+1] = element;
       GfxDir[ax][ay+1] = MovDir[ax][ay+1] = MV_DOWN;
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1)))
@@ -9324,7 +9534,7 @@ static void MauerAbleger(int ax, int ay)
   {
     if (links_frei)
     {
-      Feld[ax-1][ay] = EL_EXPANDABLE_WALL_GROWING;
+      Tile[ax-1][ay] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax-1][ay] = element;
       GfxDir[ax-1][ay] = MovDir[ax-1][ay] = MV_LEFT;
       if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay)))
@@ -9335,7 +9545,7 @@ static void MauerAbleger(int ax, int ay)
 
     if (rechts_frei)
     {
-      Feld[ax+1][ay] = EL_EXPANDABLE_WALL_GROWING;
+      Tile[ax+1][ay] = EL_EXPANDABLE_WALL_GROWING;
       Store[ax+1][ay] = element;
       GfxDir[ax+1][ay] = MovDir[ax+1][ay] = MV_RIGHT;
       if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay)))
@@ -9348,13 +9558,13 @@ static void MauerAbleger(int ax, int ay)
   if (element == EL_EXPANDABLE_WALL && (links_frei || rechts_frei))
     TEST_DrawLevelField(ax, ay);
 
-  if (!IN_LEV_FIELD(ax, ay-1) || IS_WALL(Feld[ax][ay-1]))
+  if (!IN_LEV_FIELD(ax, ay-1) || IS_WALL(Tile[ax][ay-1]))
     oben_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax, ay+1) || IS_WALL(Feld[ax][ay+1]))
+  if (!IN_LEV_FIELD(ax, ay+1) || IS_WALL(Tile[ax][ay+1]))
     unten_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax-1, ay) || IS_WALL(Feld[ax-1][ay]))
+  if (!IN_LEV_FIELD(ax-1, ay) || IS_WALL(Tile[ax-1][ay]))
     links_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax+1, ay) || IS_WALL(Feld[ax+1][ay]))
+  if (!IN_LEV_FIELD(ax+1, ay) || IS_WALL(Tile[ax+1][ay]))
     rechts_massiv = TRUE;
 
   if (((oben_massiv && unten_massiv) ||
@@ -9362,7 +9572,7 @@ static void MauerAbleger(int ax, int ay)
        element == EL_EXPANDABLE_WALL) &&
       ((links_massiv && rechts_massiv) ||
        element == EL_EXPANDABLE_WALL_VERTICAL))
-    Feld[ax][ay] = EL_WALL;
+    Tile[ax][ay] = EL_WALL;
 
   if (new_wall)
     PlayLevelSoundAction(ax, ay, ACTION_GROWING);
@@ -9370,7 +9580,7 @@ static void MauerAbleger(int ax, int ay)
 
 static void MauerAblegerStahl(int ax, int ay)
 {
-  int element = Feld[ax][ay];
+  int element = Tile[ax][ay];
   int graphic = el2img(element);
   boolean oben_frei = FALSE, unten_frei = FALSE;
   boolean links_frei = FALSE, rechts_frei = FALSE;
@@ -9381,10 +9591,10 @@ static void MauerAblegerStahl(int ax, int ay)
   if (IS_ANIMATED(graphic))
     DrawLevelGraphicAnimationIfNeeded(ax, ay, graphic);
 
-  if (!MovDelay[ax][ay])       /* start building new wall */
+  if (!MovDelay[ax][ay])       // start building new wall
     MovDelay[ax][ay] = 6;
 
-  if (MovDelay[ax][ay])                /* wait some time before building new wall */
+  if (MovDelay[ax][ay])                // wait some time before building new wall
   {
     MovDelay[ax][ay]--;
     if (MovDelay[ax][ay])
@@ -9405,7 +9615,7 @@ static void MauerAblegerStahl(int ax, int ay)
   {
     if (oben_frei)
     {
-      Feld[ax][ay-1] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax][ay-1] = EL_EXPANDABLE_STEELWALL_GROWING;
       Store[ax][ay-1] = element;
       GfxDir[ax][ay-1] = MovDir[ax][ay-1] = MV_UP;
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1)))
@@ -9415,7 +9625,7 @@ static void MauerAblegerStahl(int ax, int ay)
     }
     if (unten_frei)
     {
-      Feld[ax][ay+1] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax][ay+1] = EL_EXPANDABLE_STEELWALL_GROWING;
       Store[ax][ay+1] = element;
       GfxDir[ax][ay+1] = MovDir[ax][ay+1] = MV_DOWN;
       if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1)))
@@ -9430,7 +9640,7 @@ static void MauerAblegerStahl(int ax, int ay)
   {
     if (links_frei)
     {
-      Feld[ax-1][ay] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax-1][ay] = EL_EXPANDABLE_STEELWALL_GROWING;
       Store[ax-1][ay] = element;
       GfxDir[ax-1][ay] = MovDir[ax-1][ay] = MV_LEFT;
       if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay)))
@@ -9441,7 +9651,7 @@ static void MauerAblegerStahl(int ax, int ay)
 
     if (rechts_frei)
     {
-      Feld[ax+1][ay] = EL_EXPANDABLE_STEELWALL_GROWING;
+      Tile[ax+1][ay] = EL_EXPANDABLE_STEELWALL_GROWING;
       Store[ax+1][ay] = element;
       GfxDir[ax+1][ay] = MovDir[ax+1][ay] = MV_RIGHT;
       if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay)))
@@ -9451,20 +9661,20 @@ static void MauerAblegerStahl(int ax, int ay)
     }
   }
 
-  if (!IN_LEV_FIELD(ax, ay-1) || IS_WALL(Feld[ax][ay-1]))
+  if (!IN_LEV_FIELD(ax, ay-1) || IS_WALL(Tile[ax][ay-1]))
     oben_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax, ay+1) || IS_WALL(Feld[ax][ay+1]))
+  if (!IN_LEV_FIELD(ax, ay+1) || IS_WALL(Tile[ax][ay+1]))
     unten_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax-1, ay) || IS_WALL(Feld[ax-1][ay]))
+  if (!IN_LEV_FIELD(ax-1, ay) || IS_WALL(Tile[ax-1][ay]))
     links_massiv = TRUE;
-  if (!IN_LEV_FIELD(ax+1, ay) || IS_WALL(Feld[ax+1][ay]))
+  if (!IN_LEV_FIELD(ax+1, ay) || IS_WALL(Tile[ax+1][ay]))
     rechts_massiv = TRUE;
 
   if (((oben_massiv && unten_massiv) ||
        element == EL_EXPANDABLE_STEELWALL_HORIZONTAL) &&
       ((links_massiv && rechts_massiv) ||
        element == EL_EXPANDABLE_STEELWALL_VERTICAL))
-    Feld[ax][ay] = EL_STEELWALL;
+    Tile[ax][ay] = EL_STEELWALL;
 
   if (new_wall)
     PlayLevelSoundAction(ax, ay, ACTION_GROWING);
@@ -9489,9 +9699,9 @@ static void CheckForDragon(int x, int y)
       int xx = x + j * xy[i][0], yy = y + j * xy[i][1];
 
       if (IN_LEV_FIELD(xx, yy) &&
-         (Feld[xx][yy] == EL_FLAMES || Feld[xx][yy] == EL_DRAGON))
+         (Tile[xx][yy] == EL_FLAMES || Tile[xx][yy] == EL_DRAGON))
       {
-       if (Feld[xx][yy] == EL_DRAGON)
+       if (Tile[xx][yy] == EL_DRAGON)
          dragon_found = TRUE;
       }
       else
@@ -9507,9 +9717,9 @@ static void CheckForDragon(int x, int y)
       {
        int xx = x + j * xy[i][0], yy = y + j * xy[i][1];
   
-       if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_FLAMES)
+       if (IN_LEV_FIELD(xx, yy) && Tile[xx][yy] == EL_FLAMES)
        {
-         Feld[xx][yy] = EL_EMPTY;
+         Tile[xx][yy] = EL_EMPTY;
          TEST_DrawLevelField(xx, yy);
        }
        else
@@ -9521,7 +9731,7 @@ static void CheckForDragon(int x, int y)
 
 static void InitBuggyBase(int x, int y)
 {
-  int element = Feld[x][y];
+  int element = Tile[x][y];
   int activating_delay = FRAMES_PER_SECOND / 4;
 
   ChangeDelay[x][y] =
@@ -9572,7 +9782,7 @@ static void ChangeActiveTrap(int x, int y)
 {
   int graphic = IMG_TRAP_ACTIVE;
 
-  /* if new animation frame was drawn, correct crumbled sand border */
+  // if new animation frame was drawn, correct crumbled sand border
   if (IS_NEW_FRAME(GfxFrame[x][y], graphic))
     TEST_DrawLevelFieldCrumbled(x, y);
 }
@@ -9614,7 +9824,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
   if (!change->has_action)
     return;
 
-  /* ---------- determine action paramater values -------------------------- */
+  // ---------- determine action paramater values -----------------------------
 
   int level_time_value =
     (level.time > 0 ? TimeLeft :
@@ -9674,8 +9884,8 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
      action_arg == CA_ARG_NUMBER_CE_SCORE ? ei->collect_score :
      action_arg == CA_ARG_NUMBER_CE_DELAY ? GET_CE_DELAY_VALUE(change) :
      action_arg == CA_ARG_NUMBER_LEVEL_TIME ? level_time_value :
-     action_arg == CA_ARG_NUMBER_LEVEL_GEMS ? local_player->gems_still_needed :
-     action_arg == CA_ARG_NUMBER_LEVEL_SCORE ? local_player->score :
+     action_arg == CA_ARG_NUMBER_LEVEL_GEMS ? game.gems_still_needed :
+     action_arg == CA_ARG_NUMBER_LEVEL_SCORE ? game.score :
      action_arg == CA_ARG_ELEMENT_CV_TARGET ? GET_NEW_CE_VALUE(target_element):
      action_arg == CA_ARG_ELEMENT_CV_TRIGGER ? change->actual_trigger_ce_value:
      action_arg == CA_ARG_ELEMENT_CV_ACTION ? GET_NEW_CE_VALUE(action_element):
@@ -9688,9 +9898,9 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
      -1);
 
   int action_arg_number_old =
-    (action_type == CA_SET_LEVEL_GEMS ? local_player->gems_still_needed :
+    (action_type == CA_SET_LEVEL_GEMS ? game.gems_still_needed :
      action_type == CA_SET_LEVEL_TIME ? TimeLeft :
-     action_type == CA_SET_LEVEL_SCORE ? local_player->score :
+     action_type == CA_SET_LEVEL_SCORE ? game.score :
      action_type == CA_SET_CE_VALUE ? CustomValue[x][y] :
      action_type == CA_SET_CE_SCORE ? ei->collect_score :
      0);
@@ -9711,7 +9921,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
      action_arg == CA_ARG_PLAYER_ACTION ? 1 << GET_PLAYER_NR(action_element) :
      PLAYER_BITS_ANY);
 
-  /* ---------- execute action  -------------------------------------------- */
+  // ---------- execute action  -----------------------------------------------
 
   switch (action_type)
   {
@@ -9720,7 +9930,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
       return;
     }
 
-    /* ---------- level actions  ------------------------------------------- */
+    // ---------- level actions  ----------------------------------------------
 
     case CA_RESTART_LEVEL:
     {
@@ -9742,7 +9952,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
     case CA_SET_LEVEL_TIME:
     {
-      if (level.time > 0)      /* only modify limited time value */
+      if (level.time > 0)      // only modify limited time value
       {
        TimeLeft = action_arg_number_new;
 
@@ -9760,9 +9970,9 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
     case CA_SET_LEVEL_SCORE:
     {
-      local_player->score = action_arg_number_new;
+      game.score = action_arg_number_new;
 
-      game_panel_controls[GAME_PANEL_SCORE].value = local_player->score;
+      game_panel_controls[GAME_PANEL_SCORE].value = game.score;
 
       DisplayGameControlValues();
 
@@ -9771,12 +9981,11 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
     case CA_SET_LEVEL_GEMS:
     {
-      local_player->gems_still_needed = action_arg_number_new;
+      game.gems_still_needed = action_arg_number_new;
 
       game.snapshot.collected_item = TRUE;
 
-      game_panel_controls[GAME_PANEL_GEMS].value =
-       local_player->gems_still_needed;
+      game_panel_controls[GAME_PANEL_GEMS].value = game.gems_still_needed;
 
       DisplayGameControlValues();
 
@@ -9792,20 +10001,23 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
     case CA_SET_LEVEL_RANDOM_SEED:
     {
-      /* ensure that setting a new random seed while playing is predictable */
+      // ensure that setting a new random seed while playing is predictable
       InitRND(action_arg_number_new ? action_arg_number_new : RND(1000000) + 1);
 
       break;
     }
 
-    /* ---------- player actions  ------------------------------------------ */
+    // ---------- player actions  ---------------------------------------------
 
     case CA_MOVE_PLAYER:
+    case CA_MOVE_PLAYER_NEW:
     {
-      /* automatically move to the next field in specified direction */
+      // automatically move to the next field in specified direction
       for (i = 0; i < MAX_PLAYERS; i++)
        if (trigger_player_bits & (1 << i))
-         stored_player[i].programmed_action = action_arg_direction;
+         if (action_type == CA_MOVE_PLAYER ||
+             stored_player[i].MovPos == 0)
+           stored_player[i].programmed_action = action_arg_direction;
 
       break;
     }
@@ -9816,8 +10028,8 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
        if (action_arg_player_bits & (1 << i))
          ExitPlayer(&stored_player[i]);
 
-      if (AllPlayersGone)
-       PlayerWins(local_player);
+      if (game.players_still_needed == 0)
+       LevelSolved();
 
       break;
     }
@@ -9955,7 +10167,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
          SetPlayerWaiting(&stored_player[i], FALSE);
 
-         /* set number of special actions for bored and sleeping animation */
+         // set number of special actions for bored and sleeping animation
          stored_player[i].num_special_action_bored =
            get_num_special_action(artwork_element,
                                   ACTION_BORING_1, ACTION_BORING_LAST);
@@ -10066,7 +10278,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
       break;
     }
 
-    /* ---------- CE actions  ---------------------------------------------- */
+    // ---------- CE actions  -------------------------------------------------
 
     case CA_SET_CE_VALUE:
     {
@@ -10081,6 +10293,9 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
        if (CustomValue[x][y] == 0)
        {
+         // reset change counter (else CE_VALUE_GETS_ZERO would not work)
+         ChangeCount[x][y] = 0;        // allow at least one more change
+
          CheckElementChange(x, y, element, EL_UNDEFINED, CE_VALUE_GETS_ZERO);
          CheckTriggeredElementChange(x, y, element, CE_VALUE_GETS_ZERO_OF_X);
        }
@@ -10104,6 +10319,9 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
        {
          int xx, yy;
 
+         // reset change counter (else CE_SCORE_GETS_ZERO would not work)
+         ChangeCount[x][y] = 0;        // allow at least one more change
+
          CheckElementChange(x, y, element, EL_UNDEFINED, CE_SCORE_GETS_ZERO);
          CheckTriggeredElementChange(x, y, element, CE_SCORE_GETS_ZERO_OF_X);
 
@@ -10120,7 +10338,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
          */
          SCAN_PLAYFIELD(xx, yy)
          {
-           if (Feld[xx][yy] == element)
+           if (Tile[xx][yy] == element)
              CheckElementChange(xx, yy, element, EL_UNDEFINED,
                                 CE_SCORE_GETS_ZERO);
          }
@@ -10147,7 +10365,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
       SCAN_PLAYFIELD(xx, yy)
       {
-       if (Feld[xx][yy] == element)
+       if (Tile[xx][yy] == element)
        {
          if (reset_frame)
          {
@@ -10162,7 +10380,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
       break;
     }
 
-    /* ---------- engine actions  ------------------------------------------ */
+    // ---------- engine actions  ---------------------------------------------
 
     case CA_SET_ENGINE_SCAN_MODE:
     {
@@ -10178,7 +10396,7 @@ static void ExecuteCustomElementAction(int x, int y, int element, int page)
 
 static void CreateFieldExt(int x, int y, int element, boolean is_change)
 {
-  int old_element = Feld[x][y];
+  int old_element = Tile[x][y];
   int new_element = GetElementFromGroupElement(element);
   int previous_move_direction = MovDir[x][y];
   int last_ce_value = CustomValue[x][y];
@@ -10195,7 +10413,7 @@ static void CreateFieldExt(int x, int y, int element, boolean is_change)
     else
       RemoveField(x, y);
 
-    Feld[x][y] = new_element;
+    Tile[x][y] = new_element;
 
     if (element_info[new_element].move_direction_initial == MV_START_PREVIOUS)
       MovDir[x][y] = previous_move_direction;
@@ -10205,7 +10423,7 @@ static void CreateFieldExt(int x, int y, int element, boolean is_change)
 
     InitField_WithBug1(x, y, FALSE);
 
-    new_element = Feld[x][y];  /* element may have changed */
+    new_element = Tile[x][y];  // element may have changed
 
     ResetGfxAnimation(x, y);
     ResetRandomAnimationValue(x, y);
@@ -10216,9 +10434,9 @@ static void CreateFieldExt(int x, int y, int element, boolean is_change)
       TEST_DrawLevelFieldCrumbledNeighbours(x, y);
   }
 
-  /* check if element under the player changes from accessible to unaccessible
-     (needed for special case of dropping element which then changes) */
-  /* (must be checked after creating new element for walkable group elements) */
+  // check if element under the player changes from accessible to unaccessible
+  // (needed for special case of dropping element which then changes)
+  // (must be checked after creating new element for walkable group elements)
   if (IS_PLAYER(x, y) && !player_explosion_protected &&
       IS_ACCESSIBLE(old_element) && !IS_ACCESSIBLE(new_element))
   {
@@ -10227,12 +10445,12 @@ static void CreateFieldExt(int x, int y, int element, boolean is_change)
     return;
   }
 
-  /* "ChangeCount" not set yet to allow "entered by player" change one time */
+  // "ChangeCount" not set yet to allow "entered by player" change one time
   if (new_element_is_player)
     RelocatePlayer(x, y, new_element);
 
   if (is_change)
-    ChangeCount[x][y]++;       /* count number of changes in the same frame */
+    ChangeCount[x][y]++;       // count number of changes in the same frame
 
   TestIfBadThingTouchesPlayer(x, y);
   TestIfPlayerTouchesCustomElement(x, y);
@@ -10250,10 +10468,10 @@ static void CreateElementFromChange(int x, int y, int element)
 
   if (game.engine_version >= VERSION_IDENT(3,2,0,7))
   {
-    int old_element = Feld[x][y];
+    int old_element = Tile[x][y];
 
-    /* prevent changed element from moving in same engine frame
-       unless both old and new element can either fall or move */
+    // prevent changed element from moving in same engine frame
+    // unless both old and new element can either fall or move
     if ((!CAN_FALL(old_element) || !CAN_FALL(element)) &&
        (!CAN_MOVE(old_element) || !CAN_MOVE(element)))
       Stop[x][y] = TRUE;
@@ -10269,15 +10487,15 @@ static boolean ChangeElement(int x, int y, int element, int page)
   int ce_value = CustomValue[x][y];
   int ce_score = ei->collect_score;
   int target_element;
-  int old_element = Feld[x][y];
+  int old_element = Tile[x][y];
 
-  /* always use default change event to prevent running into a loop */
+  // always use default change event to prevent running into a loop
   if (ChangeEvent[x][y] == -1)
     ChangeEvent[x][y] = CE_DELAY;
 
   if (ChangeEvent[x][y] == CE_DELAY)
   {
-    /* reset actual trigger element, trigger player and action element */
+    // reset actual trigger element, trigger player and action element
     change->actual_trigger_element = EL_EMPTY;
     change->actual_trigger_player = EL_EMPTY;
     change->actual_trigger_player_bits = CH_PLAYER_NONE;
@@ -10286,11 +10504,11 @@ static boolean ChangeElement(int x, int y, int element, int page)
     change->actual_trigger_ce_score = 0;
   }
 
-  /* do not change elements more than a specified maximum number of changes */
+  // do not change elements more than a specified maximum number of changes
   if (ChangeCount[x][y] >= game.max_num_changes_per_frame)
     return FALSE;
 
-  ChangeCount[x][y]++;         /* count number of changes in the same frame */
+  ChangeCount[x][y]++;         // count number of changes in the same frame
 
   if (change->explode)
   {
@@ -10320,12 +10538,12 @@ static boolean ChangeElement(int x, int y, int element, int page)
 
       can_replace[xx][yy] = TRUE;
 
-      if (ex == x && ey == y)  /* do not check changing element itself */
+      if (ex == x && ey == y)  // do not check changing element itself
        continue;
 
       if (content_element == EL_EMPTY_SPACE)
       {
-       can_replace[xx][yy] = FALSE;    /* do not replace border with space */
+       can_replace[xx][yy] = FALSE;    // do not replace border with space
 
        continue;
       }
@@ -10338,7 +10556,7 @@ static boolean ChangeElement(int x, int y, int element, int page)
        continue;
       }
 
-      e = Feld[ex][ey];
+      e = Tile[ex][ey];
 
       if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey))
        e = MovingOrBlocked2Element(ex, ey);
@@ -10395,9 +10613,9 @@ static boolean ChangeElement(int x, int y, int element, int page)
 
          something_has_changed = TRUE;
 
-         /* for symmetry reasons, freeze newly created border elements */
+         // for symmetry reasons, freeze newly created border elements
          if (ex != x || ey != y)
-           Stop[ex][ey] = TRUE;        /* no more moving in this frame */
+           Stop[ex][ey] = TRUE;        // no more moving in this frame
        }
       }
 
@@ -10427,7 +10645,7 @@ static boolean ChangeElement(int x, int y, int element, int page)
     PlayLevelSoundElementAction(x, y, element, ACTION_PAGE_1 + page);
   }
 
-  /* this uses direct change before indirect change */
+  // this uses direct change before indirect change
   CheckTriggeredElementChangeByPage(x, y, old_element, CE_CHANGE_OF_X, page);
 
   return TRUE;
@@ -10444,29 +10662,27 @@ static void HandleElementChange(int x, int y, int page)
   if (!CAN_CHANGE_OR_HAS_ACTION(element) &&
       !CAN_CHANGE_OR_HAS_ACTION(Back[x][y]))
   {
-    printf("\n\n");
-    printf("HandleElementChange(): %d,%d: element = %d ('%s')\n",
-          x, y, element, element_info[element].token_name);
-    printf("HandleElementChange(): This should never happen!\n");
-    printf("\n\n");
+    Debug("game:playing:HandleElementChange", "%d,%d: element = %d ('%s')",
+         x, y, element, element_info[element].token_name);
+    Debug("game:playing:HandleElementChange", "This should never happen!");
   }
 #endif
 
-  /* this can happen with classic bombs on walkable, changing elements */
+  // this can happen with classic bombs on walkable, changing elements
   if (!CAN_CHANGE_OR_HAS_ACTION(element))
   {
     return;
   }
 
-  if (ChangeDelay[x][y] == 0)          /* initialize element change */
+  if (ChangeDelay[x][y] == 0)          // initialize element change
   {
     ChangeDelay[x][y] = GET_CHANGE_DELAY(change) + 1;
 
     if (change->can_change)
     {
-      /* !!! not clear why graphic animation should be reset at all here !!! */
-      /* !!! UPDATE: but is needed for correct Snake Bite tail animation !!! */
-      /* !!! SOLUTION: do not reset if graphics engine set to 4 or above !!! */
+      // !!! not clear why graphic animation should be reset at all here !!!
+      // !!! UPDATE: but is needed for correct Snake Bite tail animation !!!
+      // !!! SOLUTION: do not reset if graphics engine set to 4 or above !!!
 
       /*
        GRAPHICAL BUG ADDRESSED BY CHECKING GRAPHICS ENGINE VERSION:
@@ -10506,8 +10722,8 @@ static void HandleElementChange(int x, int y, int page)
        This can also be seen from the debug output for this test element.)
       */
 
-      /* when a custom element is about to change (for example by change delay),
-        do not reset graphic animation when the custom element is moving */
+      // when a custom element is about to change (for example by change delay),
+      // do not reset graphic animation when the custom element is moving
       if (game.graphics_engine_version < 4 &&
          !IS_MOVING(x, y))
       {
@@ -10522,7 +10738,7 @@ static void HandleElementChange(int x, int y, int page)
 
   ChangeDelay[x][y]--;
 
-  if (ChangeDelay[x][y] != 0)          /* continue element change */
+  if (ChangeDelay[x][y] != 0)          // continue element change
   {
     if (change->can_change)
     {
@@ -10535,9 +10751,9 @@ static void HandleElementChange(int x, int y, int page)
        change->change_function(x, y);
     }
   }
-  else                                 /* finish element change */
+  else                                 // finish element change
   {
-    if (ChangePage[x][y] != -1)                /* remember page from delayed change */
+    if (ChangePage[x][y] != -1)                // remember page from delayed change
     {
       page = ChangePage[x][y];
       ChangePage[x][y] = -1;
@@ -10545,15 +10761,15 @@ static void HandleElementChange(int x, int y, int page)
       change = &ei->change_page[page];
     }
 
-    if (IS_MOVING(x, y))               /* never change a running system ;-) */
+    if (IS_MOVING(x, y))               // never change a running system ;-)
     {
-      ChangeDelay[x][y] = 1;           /* try change after next move step */
-      ChangePage[x][y] = page;         /* remember page to use for change */
+      ChangeDelay[x][y] = 1;           // try change after next move step
+      ChangePage[x][y] = page;         // remember page to use for change
 
       return;
     }
 
-    /* special case: set new level random seed before changing element */
+    // special case: set new level random seed before changing element
     if (change->has_action && change->action_type == CA_SET_LEVEL_RANDOM_SEED)
       handle_action_before_change = TRUE;
 
@@ -10624,13 +10840,13 @@ static boolean CheckTriggeredElementChangeExt(int trigger_x, int trigger_y,
 
          SCAN_PLAYFIELD(x, y)
          {
-           if (Feld[x][y] == element)
+           if (Tile[x][y] == element)
            {
              if (change->can_change && !change_done)
              {
-               /* if element already changed in this frame, not only prevent
-                  another element change (checked in ChangeElement()), but
-                  also prevent additional element actions for this element */
+               // if element already changed in this frame, not only prevent
+               // another element change (checked in ChangeElement()), but
+               // also prevent additional element actions for this element
 
                if (ChangeCount[x][y] >= game.max_num_changes_per_frame &&
                    !level.use_action_after_change_bug)
@@ -10643,9 +10859,9 @@ static boolean CheckTriggeredElementChangeExt(int trigger_x, int trigger_y,
              }
              else if (change->has_action)
              {
-               /* if element already changed in this frame, not only prevent
-                  another element change (checked in ChangeElement()), but
-                  also prevent additional element actions for this element */
+               // if element already changed in this frame, not only prevent
+               // another element change (checked in ChangeElement()), but
+               // also prevent additional element actions for this element
 
                if (ChangeCount[x][y] >= game.max_num_changes_per_frame &&
                    !level.use_action_after_change_bug)
@@ -10686,15 +10902,15 @@ static boolean CheckElementChangeExt(int x, int y,
       !HAS_ANY_CHANGE_EVENT(element, trigger_event))
     return FALSE;
 
-  if (Feld[x][y] == EL_BLOCKED)
+  if (Tile[x][y] == EL_BLOCKED)
   {
     Blocked2Moving(x, y, &x, &y);
-    element = Feld[x][y];
+    element = Tile[x][y];
   }
 
-  /* check if element has already changed or is about to change after moving */
+  // check if element has already changed or is about to change after moving
   if ((game.engine_version < VERSION_IDENT(3,2,0,7) &&
-       Feld[x][y] != element) ||
+       Tile[x][y] != element) ||
 
       (game.engine_version >= VERSION_IDENT(3,2,0,7) &&
        (ChangeCount[x][y] >= game.max_num_changes_per_frame ||
@@ -10715,7 +10931,7 @@ static boolean CheckElementChangeExt(int x, int y,
       (trigger_event == CE_TOUCHING_X ||
        trigger_event == CE_HITTING_X ||
        trigger_event == CE_HIT_BY_X ||
-       trigger_event == CE_DIGGING_X); /* this one was forgotten until 3.2.3 */
+       trigger_event == CE_DIGGING_X); // this one was forgotten until 3.2.3
 
     if (change->can_change_or_has_action &&
        change->has_event[trigger_event] &&
@@ -10731,7 +10947,7 @@ static boolean CheckElementChangeExt(int x, int y,
       change->actual_trigger_ce_value = CustomValue[x][y];
       change->actual_trigger_ce_score = GET_CE_SCORE(trigger_element);
 
-      /* special case: trigger element not at (x,y) position for some events */
+      // special case: trigger element not at (x,y) position for some events
       if (check_trigger_element)
       {
        static struct
@@ -10820,7 +11036,7 @@ static void SetPlayerWaiting(struct PlayerInfo *player, boolean is_waiting)
 
   if (is_waiting)
   {
-    if (!last_waiting)         /* not waiting -> waiting */
+    if (!last_waiting)         // not waiting -> waiting
     {
       player->is_waiting = TRUE;
 
@@ -10853,14 +11069,14 @@ static void SetPlayerWaiting(struct PlayerInfo *player, boolean is_waiting)
 
     if (player->is_sleeping && player->use_murphy)
     {
-      /* special case for sleeping Murphy when leaning against non-free tile */
+      // special case for sleeping Murphy when leaning against non-free tile
 
       if (!IN_LEV_FIELD(player->jx - 1, player->jy) ||
-         (Feld[player->jx - 1][player->jy] != EL_EMPTY &&
+         (Tile[player->jx - 1][player->jy] != EL_EMPTY &&
           !IS_MOVING(player->jx - 1, player->jy)))
        move_dir = MV_LEFT;
       else if (!IN_LEV_FIELD(player->jx + 1, player->jy) ||
-              (Feld[player->jx + 1][player->jy] != EL_EMPTY &&
+              (Tile[player->jx + 1][player->jy] != EL_EMPTY &&
                !IS_MOVING(player->jx + 1, player->jy)))
        move_dir = MV_RIGHT;
       else
@@ -10939,7 +11155,7 @@ static void SetPlayerWaiting(struct PlayerInfo *player, boolean is_waiting)
       }
     }
   }
-  else if (last_waiting)       /* waiting -> not waiting */
+  else if (last_waiting)       // waiting -> not waiting
   {
     player->is_waiting = FALSE;
     player->is_bored = FALSE;
@@ -10984,6 +11200,15 @@ static void CheckSaveEngineSnapshot(struct PlayerInfo *player)
     if (!player->is_dropping)
       player->was_dropping = FALSE;
   }
+
+  static struct MouseActionInfo mouse_action_last = { 0 };
+  struct MouseActionInfo mouse_action = player->effective_mouse_action;
+  boolean new_released = (!mouse_action.button && mouse_action_last.button);
+
+  if (new_released)
+    CheckSaveEngineSnapshotToList();
+
+  mouse_action_last = mouse_action;
 }
 
 static void CheckSingleStepMode(struct PlayerInfo *player)
@@ -10994,11 +11219,9 @@ static void CheckSingleStepMode(struct PlayerInfo *player)
        player stopped moving after one tile (or never starts moving at all) */
     if (!player->is_moving &&
        !player->is_pushing &&
-       !player->is_dropping_pressed)
-    {
+       !player->is_dropping_pressed &&
+       !player->effective_mouse_action.button)
       TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
-      SnapField(player, 0, 0);                 /* stop snapping */
-    }
   }
 
   CheckSaveEngineSnapshot(player);
@@ -11038,7 +11261,7 @@ static byte PlayerActions(struct PlayerInfo *player, byte player_action)
   }
   else
   {
-    /* no actions for this player (no input at player's configured device) */
+    // no actions for this player (no input at player's configured device)
 
     DigField(player, 0, 0, 0, 0, 0, 0, DF_NO_PUSH);
     SnapField(player, 0, 0);
@@ -11047,7 +11270,7 @@ static byte PlayerActions(struct PlayerInfo *player, byte player_action)
     if (player->MovPos == 0)
       SetPlayerWaiting(player, TRUE);
 
-    if (player->MovPos == 0)   /* needed for tape.playing */
+    if (player->MovPos == 0)   // needed for tape.playing
       player->is_moving = FALSE;
 
     player->is_dropping = FALSE;
@@ -11063,7 +11286,7 @@ static byte PlayerActions(struct PlayerInfo *player, byte player_action)
 static void SetMouseActionFromTapeAction(struct MouseActionInfo *mouse_action,
                                         byte *tape_action)
 {
-  if (!tape.use_mouse)
+  if (!tape.use_mouse_actions)
     return;
 
   mouse_action->lx     = tape_action[TAPE_ACTION_LX];
@@ -11074,7 +11297,7 @@ static void SetMouseActionFromTapeAction(struct MouseActionInfo *mouse_action,
 static void SetTapeActionFromMouseAction(byte *tape_action,
                                         struct MouseActionInfo *mouse_action)
 {
-  if (!tape.use_mouse)
+  if (!tape.use_mouse_actions)
     return;
 
   tape_action[TAPE_ACTION_LX]     = mouse_action->lx;
@@ -11086,50 +11309,48 @@ static void CheckLevelSolved(void)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
   {
-    if (level.native_em_level->lev->home == 0) /* all players at home */
+    if (game_em.level_solved &&
+       !game_em.game_over)                             // game won
     {
-      PlayerWins(local_player);
+      LevelSolved();
 
-      AllPlayersGone = TRUE;
+      game_em.game_over = TRUE;
 
-      level.native_em_level->lev->home = -1;
+      game.all_players_gone = TRUE;
     }
 
-    if (level.native_em_level->ply[0]->alive == 0 &&
-       level.native_em_level->ply[1]->alive == 0 &&
-       level.native_em_level->ply[2]->alive == 0 &&
-       level.native_em_level->ply[3]->alive == 0)      /* all dead */
-      AllPlayersGone = TRUE;
+    if (game_em.game_over)                             // game lost
+      game.all_players_gone = TRUE;
   }
   else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
   {
-    if (game_sp.LevelSolved &&
-       !game_sp.GameOver)                              /* game won */
+    if (game_sp.level_solved &&
+       !game_sp.game_over)                             // game won
     {
-      PlayerWins(local_player);
+      LevelSolved();
 
-      game_sp.GameOver = TRUE;
+      game_sp.game_over = TRUE;
 
-      AllPlayersGone = TRUE;
+      game.all_players_gone = TRUE;
     }
 
-    if (game_sp.GameOver)                              /* game lost */
-      AllPlayersGone = TRUE;
+    if (game_sp.game_over)                             // game lost
+      game.all_players_gone = TRUE;
   }
   else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
   {
     if (game_mm.level_solved &&
-       !game_mm.game_over)                             /* game won */
+       !game_mm.game_over)                             // game won
     {
-      PlayerWins(local_player);
+      LevelSolved();
 
       game_mm.game_over = TRUE;
 
-      AllPlayersGone = TRUE;
+      game.all_players_gone = TRUE;
     }
 
-    if (game_mm.game_over)                             /* game lost */
-      AllPlayersGone = TRUE;
+    if (game_mm.game_over)                             // game lost
+      game.all_players_gone = TRUE;
   }
 }
 
@@ -11155,7 +11376,7 @@ static void CheckLevelTime(void)
       }
     }
 
-    if (!local_player->LevelSolved && !level.use_step_counter)
+    if (!game.LevelSolved && !level.use_step_counter)
     {
       TimePlayed++;
 
@@ -11174,19 +11395,18 @@ static void CheckLevelTime(void)
        if (!TimeLeft && setup.time_limit)
        {
          if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-           level.native_em_level->lev->killed_out_of_time = TRUE;
+           game_em.lev->killed_out_of_time = TRUE;
          else
            for (i = 0; i < MAX_PLAYERS; i++)
              KillPlayer(&stored_player[i]);
        }
       }
-      else if (game.no_time_limit && !AllPlayersGone) /* level w/o time limit */
+      else if (game.no_time_limit && !game.all_players_gone)
       {
        game_panel_controls[GAME_PANEL_TIME].value = TimePlayed;
       }
 
-      level.native_em_level->lev->time =
-       (game.no_time_limit ? TimePlayed : TimeLeft);
+      game_em.lev->time = (game.no_time_limit ? TimePlayed : TimeLeft);
     }
 
     if (tape.recording || tape.playing)
@@ -11203,21 +11423,21 @@ void AdvanceFrameAndPlayerCounters(int player_nr)
 {
   int i;
 
-  /* advance frame counters (global frame counter and time frame counter) */
+  // advance frame counters (global frame counter and time frame counter)
   FrameCounter++;
   TimeFrames++;
 
-  /* advance player counters (counters for move delay, move animation etc.) */
+  // advance player counters (counters for move delay, move animation etc.)
   for (i = 0; i < MAX_PLAYERS; i++)
   {
     boolean advance_player_counters = (player_nr == -1 || player_nr == i);
     int move_delay_value = stored_player[i].move_delay_value;
     int move_frames = MOVE_DELAY_NORMAL_SPEED / move_delay_value;
 
-    if (!advance_player_counters)      /* not all players may be affected */
+    if (!advance_player_counters)      // not all players may be affected
       continue;
 
-    if (move_frames == 0)      /* less than one move per game frame */
+    if (move_frames == 0)      // less than one move per game frame
     {
       int stepsize = TILEX / move_delay_value;
       int delay = move_delay_value / MOVE_DELAY_NORMAL_SPEED;
@@ -11236,7 +11456,7 @@ void AdvanceFrameAndPlayerCounters(int player_nr)
     if (stored_player[i].move_delay > 0)
       stored_player[i].move_delay--;
 
-    /* due to bugs in previous versions, counter must count up, not down */
+    // due to bugs in previous versions, counter must count up, not down
     if (stored_player[i].push_delay != -1)
       stored_player[i].push_delay++;
 
@@ -11275,22 +11495,22 @@ static void GameActionsExt(void)
   unsigned int game_frame_delay_value;
   byte *recorded_player_action;
   byte summarized_player_action = 0;
-  byte tape_action[MAX_PLAYERS];
+  byte tape_action[MAX_TAPE_ACTIONS] = { 0 };
   int i;
 
-  /* detect endless loops, caused by custom element programming */
+  // detect endless loops, caused by custom element programming
   if (recursion_loop_detected && recursion_loop_depth == 0)
   {
     char *message = getStringCat3("Internal Error! Element ",
                                  EL_NAME(recursion_loop_element),
                                  " caused endless loop! Quit the game?");
 
-    Error(ERR_WARN, "element '%s' caused endless loop in game engine",
-         EL_NAME(recursion_loop_element));
+    Warn("element '%s' caused endless loop in game engine",
+        EL_NAME(recursion_loop_element));
 
     RequestQuitGameExt(FALSE, level_editor_test_game, message);
 
-    recursion_loop_detected = FALSE;   /* if game should be continued */
+    recursion_loop_detected = FALSE;   // if game should be continued
 
     free(message);
 
@@ -11302,13 +11522,13 @@ static void GameActionsExt(void)
 
   CheckLevelSolved();
 
-  if (local_player->LevelSolved && !local_player->LevelSolved_GameEnd)
+  if (game.LevelSolved && !game.LevelSolved_GameEnd)
     GameWon();
 
-  if (AllPlayersGone && !TAPE_IS_STOPPED(tape))
+  if (game.all_players_gone && !TAPE_IS_STOPPED(tape))
     TapeStop();
 
-  if (game_status != GAME_MODE_PLAYING)                /* status might have changed */
+  if (game_status != GAME_MODE_PLAYING)                // status might have changed
     return;
 
   game_frame_delay_value =
@@ -11319,16 +11539,25 @@ static void GameActionsExt(void)
 
   SetVideoFrameDelay(game_frame_delay_value);
 
+  // (de)activate virtual buttons depending on current game status
+  if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+  {
+    if (game.all_players_gone) // if no players there to be controlled anymore
+      SetOverlayActive(FALSE);
+    else if (!tape.playing)    // if game continues after tape stopped playing
+      SetOverlayActive(TRUE);
+  }
+
 #if 0
 #if 0
-  /* ---------- main game synchronization point ---------- */
+  // ---------- main game synchronization point ----------
 
   int skip = WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value);
 
-  printf("::: skip == %d\n", skip);
+  Debug("game:playing:skip", "skip == %d", skip);
 
 #else
-  /* ---------- main game synchronization point ---------- */
+  // ---------- main game synchronization point ----------
 
   WaitUntilDelayReached(&game_frame_delay, game_frame_delay_value);
 #endif
@@ -11336,29 +11565,30 @@ static void GameActionsExt(void)
 
   if (network_playing && !network_player_action_received)
   {
-    /* try to get network player actions in time */
+    // try to get network player actions in time
 
-    /* last chance to get network player actions without main loop delay */
+    // last chance to get network player actions without main loop delay
     HandleNetworking();
 
-    /* game was quit by network peer */
+    // game was quit by network peer
     if (game_status != GAME_MODE_PLAYING)
       return;
 
-    if (!network_player_action_received)
-      return;          /* failed to get network player actions in time */
+    // check if network player actions still missing and game still running
+    if (!network_player_action_received && !checkGameEnded())
+      return;          // failed to get network player actions in time
 
-    /* do not yet reset "network_player_action_received" (for tape.pausing) */
+    // do not yet reset "network_player_action_received" (for tape.pausing)
   }
 
   if (tape.pausing)
     return;
 
-  /* at this point we know that we really continue executing the game */
+  // at this point we know that we really continue executing the game
 
   network_player_action_received = FALSE;
 
-  /* when playing tape, read previously recorded player input from tape data */
+  // when playing tape, read previously recorded player input from tape data
   recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
 
   local_player->effective_mouse_action = local_player->mouse_action;
@@ -11367,7 +11597,7 @@ static void GameActionsExt(void)
     SetMouseActionFromTapeAction(&local_player->effective_mouse_action,
                                 recorded_player_action);
 
-  /* TapePlayAction() may return NULL when toggling to "pause before death" */
+  // TapePlayAction() may return NULL when toggling to "pause before death"
   if (tape.pausing)
     return;
 
@@ -11385,7 +11615,7 @@ static void GameActionsExt(void)
       stored_player[i].effective_action = stored_player[i].action;
   }
 
-  if (network_playing)
+  if (network_playing && !checkGameEnded())
     SendToServer_MovePlayer(summarized_player_action);
 
   // summarize all actions at local players mapped input device position
@@ -11394,13 +11624,14 @@ static void GameActionsExt(void)
     stored_player[map_player_action[local_player->index_nr]].effective_action =
       summarized_player_action;
 
+  // summarize all actions at centered player in local team mode
   if (tape.recording &&
-      setup.team_mode &&
+      setup.team_mode && !network.enabled &&
       setup.input_on_focus &&
       game.centered_player_nr != -1)
   {
     for (i = 0; i < MAX_PLAYERS; i++)
-      stored_player[i].effective_action =
+      stored_player[map_player_action[i]].effective_action =
        (i == game.centered_player_nr ? summarized_player_action : 0);
   }
 
@@ -11424,10 +11655,14 @@ static void GameActionsExt(void)
   SetTapeActionFromMouseAction(tape_action,
                               &local_player->effective_mouse_action);
 
-  /* only record actions from input devices, but not programmed actions */
+  // only record actions from input devices, but not programmed actions
   if (tape.recording)
     TapeRecordAction(tape_action);
 
+  // remember if game was played (especially after tape stopped playing)
+  if (!tape.playing && summarized_player_action)
+    game.GamePlayed = TRUE;
+
 #if USE_NEW_PLAYER_ASSIGNMENTS
   // !!! also map player actions in single player mode !!!
   // if (game.team_mode)
@@ -11436,9 +11671,8 @@ static void GameActionsExt(void)
     byte mapped_action[MAX_PLAYERS];
 
 #if DEBUG_PLAYER_ACTIONS
-    printf(":::");
     for (i = 0; i < MAX_PLAYERS; i++)
-      printf(" %d, ", stored_player[i].effective_action);
+      DebugContinued("", "%d, ", stored_player[i].effective_action);
 #endif
 
     for (i = 0; i < MAX_PLAYERS; i++)
@@ -11448,19 +11682,18 @@ static void GameActionsExt(void)
       stored_player[i].effective_action = mapped_action[i];
 
 #if DEBUG_PLAYER_ACTIONS
-    printf(" =>");
+    DebugContinued("", "=> ");
     for (i = 0; i < MAX_PLAYERS; i++)
-      printf(" %d, ", stored_player[i].effective_action);
-    printf("\n");
+      DebugContinued("", "%d, ", stored_player[i].effective_action);
+    DebugContinued("game:playing:player", "\n");
 #endif
   }
 #if DEBUG_PLAYER_ACTIONS
   else
   {
-    printf(":::");
     for (i = 0; i < MAX_PLAYERS; i++)
-      printf(" %d, ", stored_player[i].effective_action);
-    printf("\n");
+      DebugContinued("", "%d, ", stored_player[i].effective_action);
+    DebugContinued("game:playing:player", "\n");
   }
 #endif
 #endif
@@ -11502,7 +11735,7 @@ static void GameActionsExt(void)
   CheckLevelSolved();
   CheckLevelTime();
 
-  AdvanceFrameAndPlayerCounters(-1);   /* advance counters for all players */
+  AdvanceFrameAndPlayerCounters(-1);   // advance counters for all players
 
   if (global.show_frames_per_second)
   {
@@ -11512,18 +11745,18 @@ static void GameActionsExt(void)
 
     fps_frames++;
 
-    if (fps_delay_ms >= 500)   /* calculate FPS every 0.5 seconds */
+    if (fps_delay_ms >= 500)   // calculate FPS every 0.5 seconds
     {
       global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms;
 
       fps_frames = 0;
       fps_counter = Counter();
 
-      /* always draw FPS to screen after FPS value was updated */
+      // always draw FPS to screen after FPS value was updated
       redraw_mask |= REDRAW_FPS;
     }
 
-    /* only draw FPS if no screen areas are deactivated (invisible warp mode) */
+    // only draw FPS if no screen areas are deactivated (invisible warp mode)
     if (GetDrawDeactivationMask() == REDRAW_NONE)
       redraw_mask |= REDRAW_FPS;
   }
@@ -11593,6 +11826,8 @@ void GameActions_RND_Main(void)
 
 void GameActions_RND(void)
 {
+  static struct MouseActionInfo mouse_action_last = { 0 };
+  struct MouseActionInfo mouse_action = local_player->effective_mouse_action;
   int magic_wall_x = 0, magic_wall_y = 0;
   int i, x, y, element, graphic, last_gfx_frame;
 
@@ -11611,14 +11846,14 @@ void GameActions_RND(void)
   {
     boolean all_players_fit_to_screen = checkIfAllPlayersFitToScreen_RND();
 
-    /* switching to "all players" only possible if all players fit to screen */
+    // switching to "all players" only possible if all players fit to screen
     if (game.centered_player_nr_next == -1 && !all_players_fit_to_screen)
     {
       game.centered_player_nr_next = game.centered_player_nr;
       game.set_centered_player = FALSE;
     }
 
-    /* do not switch focus to non-existing (or non-active) player */
+    // do not switch focus to non-existing (or non-active) player
     if (game.centered_player_nr_next >= 0 &&
        !stored_player[game.centered_player_nr_next].active)
     {
@@ -11628,7 +11863,7 @@ void GameActions_RND(void)
   }
 
   if (game.set_centered_player &&
-      ScreenMovPos == 0)       /* screen currently aligned at tile position */
+      ScreenMovPos == 0)       // screen currently aligned at tile position
   {
     int sx, sy;
 
@@ -11664,7 +11899,7 @@ void GameActions_RND(void)
       CheckGravityMovement(&stored_player[i]);
 #endif
 
-    /* overwrite programmed action with tape action */
+    // overwrite programmed action with tape action
     if (stored_player[i].programmed_action)
       actual_player_action = stored_player[i].programmed_action;
 
@@ -11694,11 +11929,11 @@ void GameActions_RND(void)
       if (player->active && player->is_pushing && player->is_moving &&
          IS_MOVING(x, y) &&
          (game.engine_version < VERSION_IDENT(2,2,0,7) ||
-          Feld[x][y] == EL_SPRING))
+          Tile[x][y] == EL_SPRING))
       {
        ContinueMoving(x, y);
 
-       /* continue moving after pushing (this is actually a bug) */
+       // continue moving after pushing (this is actually a bug)
        if (!IS_MOVING(x, y))
          Stop[x][y] = FALSE;
       }
@@ -11707,20 +11942,20 @@ void GameActions_RND(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    Last[x][y] = Feld[x][y];
+    Last[x][y] = Tile[x][y];
 
     ChangeCount[x][y] = 0;
     ChangeEvent[x][y] = -1;
 
-    /* this must be handled before main playfield loop */
-    if (Feld[x][y] == EL_PLAYER_IS_LEAVING)
+    // this must be handled before main playfield loop
+    if (Tile[x][y] == EL_PLAYER_IS_LEAVING)
     {
       MovDelay[x][y]--;
       if (MovDelay[x][y] <= 0)
        RemoveField(x, y);
     }
 
-    if (Feld[x][y] == EL_ELEMENT_SNAPPING)
+    if (Tile[x][y] == EL_ELEMENT_SNAPPING)
     {
       MovDelay[x][y]--;
       if (MovDelay[x][y] <= 0)
@@ -11728,15 +11963,16 @@ void GameActions_RND(void)
        RemoveField(x, y);
        TEST_DrawLevelField(x, y);
 
-       TestIfElementTouchesCustomElement(x, y);        /* for empty space */
+       TestIfElementTouchesCustomElement(x, y);        // for empty space
       }
     }
 
 #if DEBUG
     if (ChangePage[x][y] != -1 && ChangeDelay[x][y] != 1)
     {
-      printf("GameActions(): x = %d, y = %d: ChangePage != -1\n", x, y);
-      printf("GameActions(): This should never happen!\n");
+      Debug("game:playing:GameActions_RND", "x = %d, y = %d: ChangePage != -1",
+           x, y);
+      Debug("game:playing:GameActions_RND", "This should never happen!");
 
       ChangePage[x][y] = -1;
     }
@@ -11770,18 +12006,36 @@ void GameActions_RND(void)
       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");
+       Debug("game:playing:GameActions_RND", "(BLOCKED => MOVING) context corrupted!");
+       Debug("game:playing:GameActions_RND", "BLOCKED: x = %d, y = %d", x, y);
+       Debug("game:playing:GameActions_RND", "!MOVING: oldx = %d, oldy = %d", oldx, oldy);
+       Debug("game:playing:GameActions_RND", "This should never happen!");
       }
     }
 #endif
   }
 
+  if (mouse_action.button)
+  {
+    int new_button = (mouse_action.button && mouse_action_last.button == 0);
+
+    x = mouse_action.lx;
+    y = mouse_action.ly;
+    element = Tile[x][y];
+
+    if (new_button)
+    {
+      CheckElementChange(x, y, element, EL_UNDEFINED, CE_CLICKED_BY_MOUSE);
+      CheckTriggeredElementChange(x, y, element, CE_MOUSE_CLICKED_ON_X);
+    }
+
+    CheckElementChange(x, y, element, EL_UNDEFINED, CE_PRESSED_BY_MOUSE);
+    CheckTriggeredElementChange(x, y, element, CE_MOUSE_PRESSED_ON_X);
+  }
+
   SCAN_PLAYFIELD(x, y)
   {
-    element = Feld[x][y];
+    element = Tile[x][y];
     graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
     last_gfx_frame = GfxFrame[x][y];
 
@@ -11806,7 +12060,7 @@ void GameActions_RND(void)
       continue;
     }
 
-    /* this may take place after moving, so 'element' may have changed */
+    // this may take place after moving, so 'element' may have changed
     if (IS_CHANGING(x, y) &&
        (game.engine_version < VERSION_IDENT(3,0,7,1) || !Stop[x][y]))
     {
@@ -11814,7 +12068,7 @@ void GameActions_RND(void)
 
       HandleElementChange(x, y, page);
 
-      element = Feld[x][y];
+      element = Tile[x][y];
       graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
     }
 
@@ -11822,7 +12076,7 @@ void GameActions_RND(void)
     {
       StartMoving(x, y);
 
-      element = Feld[x][y];
+      element = Tile[x][y];
       graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
 
       if (IS_ANIMATED(graphic) &&
@@ -11855,13 +12109,13 @@ void GameActions_RND(void)
     else if (IS_ACTIVE_BOMB(element))
       CheckDynamite(x, y);
     else if (element == EL_AMOEBA_GROWING)
-      AmoebeWaechst(x, y);
+      AmoebaGrowing(x, y);
     else if (element == EL_AMOEBA_SHRINKING)
-      AmoebaDisappearing(x, y);
+      AmoebaShrinking(x, y);
 
 #if !USE_NEW_AMOEBA_CODE
     else if (IS_AMOEBALIVE(element))
-      AmoebeAbleger(x, y);
+      AmoebaReproduce(x, y);
 #endif
 
     else if (element == EL_GAME_OF_LIFE || element == EL_BIOMAZE)
@@ -11892,7 +12146,7 @@ void GameActions_RND(void)
     else if (element == EL_FLAMES)
       CheckForDragon(x, y);
     else if (element == EL_EXPLOSION)
-      ;        /* drawing of correct explosion animation is handled separately */
+      ;        // drawing of correct explosion animation is handled separately
     else if (element == EL_ELEMENT_SNAPPING ||
             element == EL_DIAGONAL_SHRINKING ||
             element == EL_DIAGONAL_GROWING)
@@ -11911,7 +12165,7 @@ void GameActions_RND(void)
     {
       int jx = local_player->jx, jy = local_player->jy;
 
-      /* play the element sound at the position nearest to the player */
+      // play the element sound at the position nearest to the player
       if ((element == EL_MAGIC_WALL_FULL ||
           element == EL_MAGIC_WALL_ACTIVE ||
           element == EL_MAGIC_WALL_EMPTYING ||
@@ -11921,7 +12175,8 @@ void GameActions_RND(void)
           element == EL_DC_MAGIC_WALL_FULL ||
           element == EL_DC_MAGIC_WALL_ACTIVE ||
           element == EL_DC_MAGIC_WALL_EMPTYING) &&
-         ABS(x-jx) + ABS(y-jy) < ABS(magic_wall_x-jx) + ABS(magic_wall_y-jy))
+         ABS(x - jx) + ABS(y - jy) <
+         ABS(magic_wall_x - jx) + ABS(magic_wall_y - jy))
       {
        magic_wall_x = x;
        magic_wall_y = y;
@@ -11930,7 +12185,7 @@ void GameActions_RND(void)
   }
 
 #if USE_NEW_AMOEBA_CODE
-  /* new experimental amoeba growth stuff */
+  // new experimental amoeba growth stuff
   if (!(FrameCounter % 8))
   {
     static unsigned int random = 1684108901;
@@ -11939,7 +12194,7 @@ void GameActions_RND(void)
     {
       x = RND(lev_fieldx);
       y = RND(lev_fieldy);
-      element = Feld[x][y];
+      element = Tile[x][y];
 
       if (!IS_PLAYER(x,y) &&
          (element == EL_EMPTY ||
@@ -11949,11 +12204,11 @@ void GameActions_RND(void)
           element == EL_ACID_SPLASH_LEFT ||
           element == EL_ACID_SPLASH_RIGHT))
       {
-       if ((IN_LEV_FIELD(x, y-1) && Feld[x][y-1] == EL_AMOEBA_WET) ||
-           (IN_LEV_FIELD(x-1, y) && Feld[x-1][y] == EL_AMOEBA_WET) ||
-           (IN_LEV_FIELD(x+1, y) && Feld[x+1][y] == EL_AMOEBA_WET) ||
-           (IN_LEV_FIELD(x, y+1) && Feld[x][y+1] == EL_AMOEBA_WET))
-         Feld[x][y] = EL_AMOEBA_DROP;
+       if ((IN_LEV_FIELD(x, y-1) && Tile[x][y-1] == EL_AMOEBA_WET) ||
+           (IN_LEV_FIELD(x-1, y) && Tile[x-1][y] == EL_AMOEBA_WET) ||
+           (IN_LEV_FIELD(x+1, y) && Tile[x+1][y] == EL_AMOEBA_WET) ||
+           (IN_LEV_FIELD(x, y+1) && Tile[x][y+1] == EL_AMOEBA_WET))
+         Tile[x][y] = EL_AMOEBA_DROP;
       }
 
       random = random * 129 + 1;
@@ -11965,7 +12220,7 @@ void GameActions_RND(void)
 
   SCAN_PLAYFIELD(x, y)
   {
-    element = Feld[x][y];
+    element = Tile[x][y];
 
     if (ExplodeField[x][y])
       Explode(x, y, EX_PHASE_START, ExplodeField[x][y]);
@@ -11981,7 +12236,7 @@ void GameActions_RND(void)
   {
     if (!(game.magic_wall_time_left % 4))
     {
-      int element = Feld[magic_wall_x][magic_wall_y];
+      int element = Tile[magic_wall_x][magic_wall_y];
 
       if (element == EL_BD_MAGIC_WALL_FULL ||
          element == EL_BD_MAGIC_WALL_ACTIVE ||
@@ -12003,24 +12258,24 @@ void GameActions_RND(void)
       {
        SCAN_PLAYFIELD(x, y)
        {
-         element = Feld[x][y];
+         element = Tile[x][y];
 
          if (element == EL_MAGIC_WALL_ACTIVE ||
              element == EL_MAGIC_WALL_FULL)
          {
-           Feld[x][y] = EL_MAGIC_WALL_DEAD;
+           Tile[x][y] = EL_MAGIC_WALL_DEAD;
            TEST_DrawLevelField(x, y);
          }
          else if (element == EL_BD_MAGIC_WALL_ACTIVE ||
                   element == EL_BD_MAGIC_WALL_FULL)
          {
-           Feld[x][y] = EL_BD_MAGIC_WALL_DEAD;
+           Tile[x][y] = EL_BD_MAGIC_WALL_DEAD;
            TEST_DrawLevelField(x, y);
          }
          else if (element == EL_DC_MAGIC_WALL_ACTIVE ||
                   element == EL_DC_MAGIC_WALL_FULL)
          {
-           Feld[x][y] = EL_DC_MAGIC_WALL_DEAD;
+           Tile[x][y] = EL_DC_MAGIC_WALL_DEAD;
            TEST_DrawLevelField(x, y);
          }
        }
@@ -12103,16 +12358,24 @@ void GameActions_RND(void)
   DrawAllPlayers();
   PlayAllPlayersSound();
 
-  if (local_player->show_envelope != 0 && local_player->MovPos == 0)
+  for (i = 0; i < MAX_PLAYERS; i++)
   {
-    ShowEnvelope(local_player->show_envelope - EL_ENVELOPE_1);
+    struct PlayerInfo *player = &stored_player[i];
 
-    local_player->show_envelope = 0;
+    if (player->show_envelope != 0 && (!player->active ||
+                                      player->MovPos == 0))
+    {
+      ShowEnvelope(player->show_envelope - EL_ENVELOPE_1);
+
+      player->show_envelope = 0;
+    }
   }
 
-  /* use random number generator in every frame to make it less predictable */
+  // use random number generator in every frame to make it less predictable
   if (game.engine_version >= VERSION_IDENT(3,1,1,0))
     RND(1);
+
+  mouse_action_last = mouse_action;
 }
 
 static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y)
@@ -12190,9 +12453,9 @@ static boolean canFallDown(struct PlayerInfo *player)
 
   return (IN_LEV_FIELD(jx, jy + 1) &&
          (IS_FREE(jx, jy + 1) ||
-          (Feld[jx][jy + 1] == EL_ACID && player->can_fall_into_acid)) &&
-         IS_WALKABLE_FROM(Feld[jx][jy], MV_DOWN) &&
-         !IS_WALKABLE_INSIDE(Feld[jx][jy]));
+          (Tile[jx][jy + 1] == EL_ACID && player->can_fall_into_acid)) &&
+         IS_WALKABLE_FROM(Tile[jx][jy], MV_DOWN) &&
+         !IS_WALKABLE_INSIDE(Tile[jx][jy]));
 }
 
 static boolean canPassField(int x, int y, int move_dir)
@@ -12202,12 +12465,12 @@ static boolean canPassField(int x, int y, int move_dir)
   int dy = (move_dir & MV_UP   ? -1 : move_dir & MV_DOWN  ? +1 : 0);
   int nextx = x + dx;
   int nexty = y + dy;
-  int element = Feld[x][y];
+  int element = Tile[x][y];
 
   return (IS_PASSABLE_FROM(element, opposite_dir) &&
          !CAN_MOVE(element) &&
          IN_LEV_FIELD(nextx, nexty) && !IS_PLAYER(nextx, nexty) &&
-         IS_WALKABLE_FROM(Feld[nextx][nexty], move_dir) &&
+         IS_WALKABLE_FROM(Tile[nextx][nexty], move_dir) &&
          (level.can_pass_to_walkable || IS_FREE(nextx, nexty)));
 }
 
@@ -12220,9 +12483,9 @@ static boolean canMoveToValidFieldWithGravity(int x, int y, int move_dir)
   int newy = y + dy;
 
   return (IN_LEV_FIELD(newx, newy) && !IS_FREE_OR_PLAYER(newx, newy) &&
-         IS_GRAVITY_REACHABLE(Feld[newx][newy]) &&
-         (IS_DIGGABLE(Feld[newx][newy]) ||
-          IS_WALKABLE_FROM(Feld[newx][newy], opposite_dir) ||
+         IS_GRAVITY_REACHABLE(Tile[newx][newy]) &&
+         (IS_DIGGABLE(Tile[newx][newy]) ||
+          IS_WALKABLE_FROM(Tile[newx][newy], opposite_dir) ||
           canPassField(newx, newy, move_dir)));
 }
 
@@ -12256,9 +12519,9 @@ static void CheckGravityMovementWhenNotMoving(struct PlayerInfo *player)
     boolean field_under_player_is_free =
       (IN_LEV_FIELD(jx, jy + 1) && IS_FREE(jx, jy + 1));
     boolean player_is_standing_on_valid_field =
-      (IS_WALKABLE_INSIDE(Feld[jx][jy]) ||
-       (IS_WALKABLE(Feld[jx][jy]) &&
-       !(element_info[Feld[jx][jy]].access_direction & MV_DOWN)));
+      (IS_WALKABLE_INSIDE(Tile[jx][jy]) ||
+       (IS_WALKABLE(Tile[jx][jy]) &&
+       !(element_info[Tile[jx][jy]].access_direction & MV_DOWN)));
 
     if (field_under_player_is_free && !player_is_standing_on_valid_field)
       player->programmed_action = MV_DOWN;
@@ -12311,9 +12574,9 @@ boolean MovePlayerOneStep(struct PlayerInfo *player,
   if (can_move != MP_MOVING)
     return can_move;
 
-  /* check if DigField() has caused relocation of the player */
+  // check if DigField() has caused relocation of the player
   if (player->jx != jx || player->jy != jy)
-    return MP_NO_ACTION;       /* <-- !!! CHECK THIS [-> MP_ACTION ?] !!! */
+    return MP_NO_ACTION;       // <-- !!! CHECK THIS [-> MP_ACTION ?] !!!
 
   StorePlayer[jx][jy] = 0;
   player->last_jx = jx;
@@ -12338,7 +12601,7 @@ boolean MovePlayerOneStep(struct PlayerInfo *player,
   player->is_moving = TRUE;
 
 #if 1
-  /* should better be called in MovePlayer(), but this breaks some tapes */
+  // should better be called in MovePlayer(), but this breaks some tapes
   ScrollPlayer(player, SCROLL_INIT);
 #endif
 
@@ -12371,27 +12634,28 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
   if (player->move_delay > 0)
     return FALSE;
 
-  player->move_delay = -1;             /* set to "uninitialized" value */
+  player->move_delay = -1;             // set to "uninitialized" value
 
-  /* store if player is automatically moved to next field */
+  // store if player is automatically moved to next field
   player->is_auto_moving = (player->programmed_action != MV_NONE);
 
-  /* remove the last programmed player action */
+  // remove the last programmed player action
   player->programmed_action = 0;
 
   if (player->MovPos)
   {
-    /* should only happen if pre-1.2 tape recordings are played */
-    /* this is only for backward compatibility */
+    // should only happen if pre-1.2 tape recordings are played
+    // this is only for backward compatibility
 
     int original_move_delay_value = player->move_delay_value;
 
 #if DEBUG
-    printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES. [%d]\n",
-          tape.counter);
+    Debug("game:playing:MovePlayer",
+         "THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES. [%d]",
+         tape.counter);
 #endif
 
-    /* scroll remaining steps with finest movement resolution */
+    // scroll remaining steps with finest movement resolution
     player->move_delay_value = MOVE_DELAY_NORMAL_SPEED;
 
     while (player->MovPos)
@@ -12438,50 +12702,57 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
        game.centered_player_nr == -1))
   {
     int old_scroll_x = scroll_x, old_scroll_y = scroll_y;
-    int offset = game.scroll_delay_value;
 
     if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy)))
     {
-      /* actual player has left the screen -- scroll in that direction */
-      if (jx != old_jx)                /* player has moved horizontally */
+      // actual player has left the screen -- scroll in that direction
+      if (jx != old_jx)                // player has moved horizontally
        scroll_x += (jx - old_jx);
-      else                     /* player has moved vertically */
+      else                     // player has moved vertically
        scroll_y += (jy - old_jy);
     }
     else
     {
-      if (jx != old_jx)                /* player has moved horizontally */
+      int offset_raw = game.scroll_delay_value;
+
+      if (jx != old_jx)                // player has moved horizontally
       {
-       if ((player->MovDir == MV_LEFT  && scroll_x > jx - MIDPOSX + offset) ||
-           (player->MovDir == MV_RIGHT && scroll_x < jx - MIDPOSX - offset))
-         scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset);
+       int offset = MIN(offset_raw, (SCR_FIELDX - 2) / 2);
+       int offset_x = offset * (player->MovDir == MV_LEFT ? +1 : -1);
+       int new_scroll_x = jx - MIDPOSX + offset_x;
 
-       /* 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);
+       if ((player->MovDir == MV_LEFT  && scroll_x > new_scroll_x) ||
+           (player->MovDir == MV_RIGHT && scroll_x < new_scroll_x))
+         scroll_x = new_scroll_x;
 
-       /* don't scroll more than one field at a time */
+       // don't scroll over playfield boundaries
+       scroll_x = MIN(MAX(SBX_Left, scroll_x), SBX_Right);
+
+       // don't scroll more than one field at a time
        scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x);
 
-       /* don't scroll against the player's moving direction */
+       // don't scroll against the player's moving direction
        if ((player->MovDir == MV_LEFT  && scroll_x > old_scroll_x) ||
            (player->MovDir == MV_RIGHT && scroll_x < old_scroll_x))
          scroll_x = old_scroll_x;
       }
-      else                     /* player has moved vertically */
+      else                     // player has moved vertically
       {
-       if ((player->MovDir == MV_UP   && scroll_y > jy - MIDPOSY + offset) ||
-           (player->MovDir == MV_DOWN && scroll_y < jy - MIDPOSY - offset))
-         scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset);
+       int offset = MIN(offset_raw, (SCR_FIELDY - 2) / 2);
+       int offset_y = offset * (player->MovDir == MV_UP ? +1 : -1);
+       int new_scroll_y = jy - MIDPOSY + offset_y;
+
+       if ((player->MovDir == MV_UP   && scroll_y > new_scroll_y) ||
+           (player->MovDir == MV_DOWN && scroll_y < new_scroll_y))
+         scroll_y = new_scroll_y;
 
-       /* 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);
+       // don't scroll over playfield boundaries
+       scroll_y = MIN(MAX(SBY_Upper, scroll_y), SBY_Lower);
 
-       /* don't scroll more than one field at a time */
+       // don't scroll more than one field at a time
        scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y);
 
-       /* don't scroll against the player's moving direction */
+       // don't scroll against the player's moving direction
        if ((player->MovDir == MV_UP   && scroll_y > old_scroll_y) ||
            (player->MovDir == MV_DOWN && scroll_y < old_scroll_y))
          scroll_y = old_scroll_y;
@@ -12513,7 +12784,7 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
     else if (old_jx == jx && old_jy != jy)
       player->MovDir = (old_jy < jy ? MV_DOWN : MV_UP);
 
-    TEST_DrawLevelField(jx, jy);       /* for "crumbled sand" */
+    TEST_DrawLevelField(jx, jy);       // for "crumbled sand"
 
     player->last_move_dir = player->MovDir;
     player->is_moving = TRUE;
@@ -12524,7 +12795,7 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
     player->drop_pressed_delay = 0;
 
 #if 0
-    /* should better be called here than above, but this breaks some tapes */
+    // should better be called here than above, but this breaks some tapes
     ScrollPlayer(player, SCROLL_INIT);
 #endif
   }
@@ -12540,10 +12811,10 @@ boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
        the player was forced to wait again for eight frames before next try) */
 
     if (game.engine_version >= VERSION_IDENT(3,1,1,0))
-      player->move_delay = 0;  /* allow direct movement in the next frame */
+      player->move_delay = 0;  // allow direct movement in the next frame
   }
 
-  if (player->move_delay == -1)                /* not yet initialized by DigField() */
+  if (player->move_delay == -1)                // not yet initialized by DigField()
     player->move_delay = player->move_delay_value;
 
   if (game.engine_version < VERSION_IDENT(3,0,7,0))
@@ -12567,7 +12838,7 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
   if (!player->active)
     return;
 
-  if (player->MovPos == 0 && mode == SCROLL_GO_ON)     /* player not moving */
+  if (player->MovPos == 0 && mode == SCROLL_GO_ON)     // player not moving
     return;
 
   if (mode == SCROLL_INIT)
@@ -12576,29 +12847,29 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
     player->GfxPos = move_stepsize * (player->MovPos / move_stepsize);
 
     if ((player->block_last_field || player->block_delay_adjustment > 0) &&
-       Feld[last_jx][last_jy] == EL_EMPTY)
+       Tile[last_jx][last_jy] == EL_EMPTY)
     {
-      int last_field_block_delay = 0;  /* start with no blocking at all */
+      int last_field_block_delay = 0;  // start with no blocking at all
       int block_delay_adjustment = player->block_delay_adjustment;
 
-      /* if player blocks last field, add delay for exactly one move */
+      // if player blocks last field, add delay for exactly one move
       if (player->block_last_field)
       {
        last_field_block_delay += player->move_delay_value;
 
-       /* when blocking enabled, prevent moving up despite gravity */
+       // when blocking enabled, prevent moving up despite gravity
        if (player->gravity && player->MovDir == MV_UP)
          block_delay_adjustment = -1;
       }
 
-      /* add block delay adjustment (also possible when not blocking) */
+      // add block delay adjustment (also possible when not blocking)
       last_field_block_delay += block_delay_adjustment;
 
-      Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING;
+      Tile[last_jx][last_jy] = EL_PLAYER_IS_LEAVING;
       MovDelay[last_jx][last_jy] = last_field_block_delay + 1;
     }
 
-    if (player->MovPos != 0)   /* player has not yet reached destination */
+    if (player->MovPos != 0)   // player has not yet reached destination
       return;
   }
   else if (!FrameReached(&player->actual_frame_counter, 1))
@@ -12609,12 +12880,12 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
     player->MovPos += (player->MovPos > 0 ? -1 : 1) * move_stepsize;
     player->GfxPos = move_stepsize * (player->MovPos / move_stepsize);
 
-    /* before DrawPlayer() to draw correct player graphic for this case */
+    // before DrawPlayer() to draw correct player graphic for this case
     if (player->MovPos == 0)
       CheckGravityMovement(player);
   }
 
-  if (player->MovPos == 0)     /* player reached destination field */
+  if (player->MovPos == 0)     // player reached destination field
   {
     if (player->move_delay_reset_counter > 0)
     {
@@ -12622,10 +12893,10 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
 
       if (player->move_delay_reset_counter == 0)
       {
-       /* continue with normal speed after quickly moving through gate */
+       // continue with normal speed after quickly moving through gate
        HALVE_PLAYER_SPEED(player);
 
-       /* be able to make the next move without delay */
+       // be able to make the next move without delay
        player->move_delay = 0;
       }
     }
@@ -12633,32 +12904,32 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
     player->last_jx = jx;
     player->last_jy = jy;
 
-    if (Feld[jx][jy] == EL_EXIT_OPEN ||
-       Feld[jx][jy] == EL_EM_EXIT_OPEN ||
-       Feld[jx][jy] == EL_EM_EXIT_OPENING ||
-       Feld[jx][jy] == EL_STEEL_EXIT_OPEN ||
-       Feld[jx][jy] == EL_EM_STEEL_EXIT_OPEN ||
-       Feld[jx][jy] == EL_EM_STEEL_EXIT_OPENING ||
-       Feld[jx][jy] == EL_SP_EXIT_OPEN ||
-       Feld[jx][jy] == EL_SP_EXIT_OPENING)     /* <-- special case */
+    if (Tile[jx][jy] == EL_EXIT_OPEN ||
+       Tile[jx][jy] == EL_EM_EXIT_OPEN ||
+       Tile[jx][jy] == EL_EM_EXIT_OPENING ||
+       Tile[jx][jy] == EL_STEEL_EXIT_OPEN ||
+       Tile[jx][jy] == EL_EM_STEEL_EXIT_OPEN ||
+       Tile[jx][jy] == EL_EM_STEEL_EXIT_OPENING ||
+       Tile[jx][jy] == EL_SP_EXIT_OPEN ||
+       Tile[jx][jy] == EL_SP_EXIT_OPENING)     // <-- special case
     {
       ExitPlayer(player);
 
-      if ((local_player->friends_still_needed == 0 ||
-          IS_SP_ELEMENT(Feld[jx][jy])) &&
-         AllPlayersGone)
-       PlayerWins(local_player);
+      if (game.players_still_needed == 0 &&
+         (game.friends_still_needed == 0 ||
+          IS_SP_ELEMENT(Tile[jx][jy])))
+       LevelSolved();
     }
 
-    /* this breaks one level: "machine", level 000 */
+    // this breaks one level: "machine", level 000
     {
       int move_direction = player->MovDir;
       int enter_side = MV_DIR_OPPOSITE(move_direction);
       int leave_side = move_direction;
       int old_jx = last_jx;
       int old_jy = last_jy;
-      int old_element = Feld[old_jx][old_jy];
-      int new_element = Feld[jx][jy];
+      int old_element = Tile[old_jx][old_jy];
+      int new_element = Tile[jx][jy];
 
       if (IS_CUSTOM_ELEMENT(old_element))
        CheckElementChangeByPlayer(old_jx, old_jy, old_element,
@@ -12689,13 +12960,13 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
       /* needed because pushed element has not yet reached its destination,
         so it would trigger a change event at its previous field location */
       if (!player->is_pushing)
-       TestIfElementTouchesCustomElement(jx, jy);      /* for empty space */
+       TestIfElementTouchesCustomElement(jx, jy);      // for empty space
 
       if (!player->active)
        RemovePlayer(player);
     }
 
-    if (!local_player->LevelSolved && level.use_step_counter)
+    if (!game.LevelSolved && level.use_step_counter)
     {
       int i;
 
@@ -12716,7 +12987,7 @@ void ScrollPlayer(struct PlayerInfo *player, int mode)
          for (i = 0; i < MAX_PLAYERS; i++)
            KillPlayer(&stored_player[i]);
       }
-      else if (game.no_time_limit && !AllPlayersGone) /* level w/o time limit */
+      else if (game.no_time_limit && !game.all_players_gone)
       {
        game_panel_controls[GAME_PANEL_TIME].value = TimePlayed;
 
@@ -12739,7 +13010,7 @@ void ScrollScreen(struct PlayerInfo *player, int mode)
 
   if (mode == SCROLL_INIT)
   {
-    /* set scrolling step size according to actual player's moving speed */
+    // set scrolling step size according to actual player's moving speed
     ScrollStepSize = TILEX / player->move_delay_value;
 
     screen_frame_counter = FrameCounter;
@@ -12772,11 +13043,11 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
   };
   static int trigger_sides[4][2] =
   {
-    /* center side       border side */
-    { CH_SIDE_TOP,     CH_SIDE_BOTTOM  },      /* check top    */
-    { CH_SIDE_LEFT,    CH_SIDE_RIGHT   },      /* check left   */
-    { CH_SIDE_RIGHT,   CH_SIDE_LEFT    },      /* check right  */
-    { CH_SIDE_BOTTOM,  CH_SIDE_TOP     }       /* check bottom */
+    // center side       border side
+    { CH_SIDE_TOP,     CH_SIDE_BOTTOM  },      // check top
+    { CH_SIDE_LEFT,    CH_SIDE_RIGHT   },      // check left
+    { CH_SIDE_RIGHT,   CH_SIDE_LEFT    },      // check right
+    { CH_SIDE_BOTTOM,  CH_SIDE_TOP     }       // check bottom
   };
   static int touch_dir[4] =
   {
@@ -12785,7 +13056,7 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
     MV_UP   | MV_DOWN,
     MV_LEFT | MV_RIGHT
   };
-  int center_element = Feld[x][y];     /* should always be non-moving! */
+  int center_element = Tile[x][y];     // should always be non-moving!
   int i;
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
@@ -12799,18 +13070,18 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
     if (!IN_LEV_FIELD(xx, yy))
       continue;
 
-    if (IS_PLAYER(x, y))               /* player found at center element */
+    if (IS_PLAYER(x, y))               // player found at center element
     {
       struct PlayerInfo *player = PLAYERINFO(x, y);
 
       if (game.engine_version < VERSION_IDENT(3,0,7,0))
-       border_element = Feld[xx][yy];          /* may be moving! */
+       border_element = Tile[xx][yy];          // may be moving!
       else if (!IS_MOVING(xx, yy) && !IS_BLOCKED(xx, yy))
-       border_element = Feld[xx][yy];
-      else if (MovDir[xx][yy] & touch_dir[i])  /* elements are touching */
+       border_element = Tile[xx][yy];
+      else if (MovDir[xx][yy] & touch_dir[i])  // elements are touching
        border_element = MovingOrBlocked2Element(xx, yy);
       else
-       continue;               /* center and border element do not touch */
+       continue;               // center and border element do not touch
 
       CheckElementChangeByPlayer(xx, yy, border_element, CE_TOUCHED_BY_PLAYER,
                                 player->index_bit, border_side);
@@ -12829,14 +13100,14 @@ void TestIfPlayerTouchesCustomElement(int x, int y)
                                 CE_TOUCHING_X, border_side);
       }
     }
-    else if (IS_PLAYER(xx, yy))                /* player found at border element */
+    else if (IS_PLAYER(xx, yy))                // player found at border element
     {
       struct PlayerInfo *player = PLAYERINFO(xx, yy);
 
       if (game.engine_version >= VERSION_IDENT(3,0,7,0))
       {
        if (player->MovPos != 0 && !(player->MovDir & touch_dir[i]))
-         continue;             /* center and border element do not touch */
+         continue;             // center and border element do not touch
       }
 
       CheckElementChangeByPlayer(x, y, center_element, CE_TOUCHED_BY_PLAYER,
@@ -12872,11 +13143,11 @@ void TestIfElementTouchesCustomElement(int x, int y)
   };
   static int trigger_sides[4][2] =
   {
-    /* center side     border side */
-    { CH_SIDE_TOP,     CH_SIDE_BOTTOM  },      /* check top    */
-    { CH_SIDE_LEFT,    CH_SIDE_RIGHT   },      /* check left   */
-    { CH_SIDE_RIGHT,   CH_SIDE_LEFT    },      /* check right  */
-    { CH_SIDE_BOTTOM,  CH_SIDE_TOP     }       /* check bottom */
+    // center side     border side
+    { CH_SIDE_TOP,     CH_SIDE_BOTTOM  },      // check top
+    { CH_SIDE_LEFT,    CH_SIDE_RIGHT   },      // check left
+    { CH_SIDE_RIGHT,   CH_SIDE_LEFT    },      // check right
+    { CH_SIDE_BOTTOM,  CH_SIDE_TOP     }       // check bottom
   };
   static int touch_dir[4] =
   {
@@ -12886,7 +13157,7 @@ void TestIfElementTouchesCustomElement(int x, int y)
     MV_LEFT | MV_RIGHT
   };
   boolean change_center_element = FALSE;
-  int center_element = Feld[x][y];     /* should always be non-moving! */
+  int center_element = Tile[x][y];     // should always be non-moving!
   int border_element_old[NUM_DIRECTIONS];
   int i;
 
@@ -12902,13 +13173,13 @@ void TestIfElementTouchesCustomElement(int x, int y)
       continue;
 
     if (game.engine_version < VERSION_IDENT(3,0,7,0))
-      border_element = Feld[xx][yy];   /* may be moving! */
+      border_element = Tile[xx][yy];   // may be moving!
     else if (!IS_MOVING(xx, yy) && !IS_BLOCKED(xx, yy))
-      border_element = Feld[xx][yy];
-    else if (MovDir[xx][yy] & touch_dir[i])    /* elements are touching */
+      border_element = Tile[xx][yy];
+    else if (MovDir[xx][yy] & touch_dir[i])    // elements are touching
       border_element = MovingOrBlocked2Element(xx, yy);
     else
-      continue;                        /* center and border element do not touch */
+      continue;                        // center and border element do not touch
 
     border_element_old[i] = border_element;
   }
@@ -12923,11 +13194,11 @@ void TestIfElementTouchesCustomElement(int x, int y)
     if (border_element == -1)
       continue;
 
-    /* check for change of border element */
+    // check for change of border element
     CheckElementChangeBySide(xx, yy, border_element, center_element,
                             CE_TOUCHING_X, center_side);
 
-    /* (center element cannot be player, so we dont have to check this here) */
+    // (center element cannot be player, so we dont have to check this here)
   }
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
@@ -12940,7 +13211,7 @@ void TestIfElementTouchesCustomElement(int x, int y)
     if (border_element == -1)
       continue;
 
-    /* check for change of center element (but change it only once) */
+    // check for change of center element (but change it only once)
     if (!change_center_element)
       change_center_element =
        CheckElementChangeBySide(x, y, center_element, border_element,
@@ -12965,7 +13236,7 @@ void TestIfElementHitsCustomElement(int x, int y, int direction)
   int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0);
   int dy = (direction == MV_UP   ? -1 : direction == MV_DOWN  ? +1 : 0);
   int hitx = x + dx, hity = y + dy;
-  int hitting_element = Feld[x][y];
+  int hitting_element = Tile[x][y];
   int touched_element;
 
   if (IN_LEV_FIELD(hitx, hity) && IS_FREE(hitx, hity))
@@ -13010,7 +13281,7 @@ void TestIfElementHitsCustomElement(int x, int y, int direction)
     }
   }
 
-  /* "hitting something" is also true when hitting the playfield border */
+  // "hitting something" is also true when hitting the playfield border
   CheckElementChangeBySide(x, y, hitting_element, touched_element,
                           CE_HITTING_SOMETHING, direction);
 }
@@ -13084,7 +13355,7 @@ void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir)
 void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
 {
   int i, kill_x = -1, kill_y = -1;
-  int bad_element = Feld[bad_x][bad_y];
+  int bad_element = Tile[bad_x][bad_y];
   static int test_xy[4][2] =
   {
     { 0, -1 },
@@ -13107,7 +13378,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
     MV_DOWN
   };
 
-  if (bad_element == EL_EXPLOSION)     /* skip just exploding bad things */
+  if (bad_element == EL_EXPLOSION)     // skip just exploding bad things
     return;
 
   for (i = 0; i < NUM_DIRECTIONS; i++)
@@ -13123,7 +13394,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
     test_move_dir =
       (IS_MOVING(test_x, test_y) ? MovDir[test_x][test_y] : MV_NONE);
 
-    test_element = Feld[test_x][test_y];
+    test_element = Tile[test_x][test_y];
 
     /* 1st case: good thing is moving towards DONT_RUN_INTO style bad thing;
        2nd case: DONT_TOUCH style bad thing does not move away from good thing
@@ -13131,18 +13402,18 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
     if ((DONT_RUN_INTO(bad_element) &&  bad_move_dir == test_dir[i]) ||
        (DONT_TOUCH(bad_element)    && test_move_dir != test_dir[i]))
     {
-      /* good thing is player or penguin that does not move away */
+      // good thing is player or penguin that does not move away
       if (IS_PLAYER(test_x, test_y))
       {
        struct PlayerInfo *player = PLAYERINFO(test_x, test_y);
 
        if (bad_element == EL_ROBOT && player->is_moving)
-         continue;     /* robot does not kill player if he is moving */
+         continue;     // robot does not kill player if he is moving
 
        if (game.engine_version >= VERSION_IDENT(3,0,7,0))
        {
          if (player->MovPos != 0 && !(player->MovDir & touch_dir[i]))
-           continue;           /* center and border element do not touch */
+           continue;           // center and border element do not touch
        }
 
        kill_x = test_x;
@@ -13179,7 +13450,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
 
 void TestIfGoodThingGetsHitByBadThing(int bad_x, int bad_y, int bad_move_dir)
 {
-  int bad_element = Feld[bad_x][bad_y];
+  int bad_element = Tile[bad_x][bad_y];
   int dx = (bad_move_dir == MV_LEFT ? -1 : bad_move_dir == MV_RIGHT ? +1 : 0);
   int dy = (bad_move_dir == MV_UP   ? -1 : bad_move_dir == MV_DOWN  ? +1 : 0);
   int test_x = bad_x + dx, test_y = bad_y + dy;
@@ -13192,11 +13463,11 @@ void TestIfGoodThingGetsHitByBadThing(int bad_x, int bad_y, int bad_move_dir)
   test_move_dir =
     (IS_MOVING(test_x, test_y) ? MovDir[test_x][test_y] : MV_NONE);
 
-  test_element = Feld[test_x][test_y];
+  test_element = Tile[test_x][test_y];
 
   if (test_move_dir != bad_move_dir)
   {
-    /* good thing can be player or penguin that does not move away */
+    // good thing can be player or penguin that does not move away
     if (IS_PLAYER(test_x, test_y))
     {
       struct PlayerInfo *player = PLAYERINFO(test_x, test_y);
@@ -13205,7 +13476,7 @@ void TestIfGoodThingGetsHitByBadThing(int bad_x, int bad_y, int bad_move_dir)
         player as being hit when he is moving towards the bad thing, because
         the "get hit by" condition would be lost after the player stops) */
       if (player->MovPos != 0 && player->MovDir == bad_move_dir)
-       return;         /* player moves away from bad thing */
+       return;         // player moves away from bad thing
 
       kill_x = test_x;
       kill_y = test_y;
@@ -13284,7 +13555,7 @@ void TestIfBadThingTouchesOtherBadThing(int bad_x, int bad_y)
     if (!IN_LEV_FIELD(x, y))
       continue;
 
-    element = Feld[x][y];
+    element = Tile[x][y];
     if (IS_AMOEBOID(element) || element == EL_GAME_OF_LIFE ||
        element == EL_AMOEBA_GROWING || element == EL_AMOEBA_DROP)
     {
@@ -13306,8 +13577,9 @@ void KillPlayer(struct PlayerInfo *player)
     return;
 
 #if 0
-  printf("::: 0: killed == %d, active == %d, reanimated == %d\n",
-        player->killed, player->active, player->reanimated);
+  Debug("game:playing:KillPlayer",
+       "0: killed == %d, active == %d, reanimated == %d",
+       player->killed, player->active, player->reanimated);
 #endif
 
   /* the following code was introduced to prevent an infinite loop when calling
@@ -13327,26 +13599,28 @@ void KillPlayer(struct PlayerInfo *player)
 
   player->killed = TRUE;
 
-  /* remove accessible field at the player's position */
-  Feld[jx][jy] = EL_EMPTY;
+  // remove accessible field at the player's position
+  Tile[jx][jy] = EL_EMPTY;
 
-  /* deactivate shield (else Bang()/Explode() would not work right) */
+  // deactivate shield (else Bang()/Explode() would not work right)
   player->shield_normal_time_left = 0;
   player->shield_deadly_time_left = 0;
 
 #if 0
-  printf("::: 1: killed == %d, active == %d, reanimated == %d\n",
-        player->killed, player->active, player->reanimated);
+  Debug("game:playing:KillPlayer",
+       "1: killed == %d, active == %d, reanimated == %d",
+       player->killed, player->active, player->reanimated);
 #endif
 
   Bang(jx, jy);
 
 #if 0
-  printf("::: 2: killed == %d, active == %d, reanimated == %d\n",
-        player->killed, player->active, player->reanimated);
+  Debug("game:playing:KillPlayer",
+       "2: killed == %d, active == %d, reanimated == %d",
+       player->killed, player->active, player->reanimated);
 #endif
 
-  if (player->reanimated)      /* killed player may have been reanimated */
+  if (player->reanimated)      // killed player may have been reanimated
     player->killed = player->reanimated = FALSE;
   else
     BuryPlayer(player);
@@ -13374,8 +13648,12 @@ void BuryPlayer(struct PlayerInfo *player)
   PlayLevelSoundElementAction(jx, jy, player->artwork_element, ACTION_DYING);
   PlayLevelSound(jx, jy, SND_GAME_LOSING);
 
-  player->GameOver = TRUE;
   RemovePlayer(player);
+
+  player->buried = TRUE;
+
+  if (game.all_players_gone)
+    game.GameOver = TRUE;
 }
 
 void RemovePlayer(struct PlayerInfo *player)
@@ -13386,6 +13664,9 @@ void RemovePlayer(struct PlayerInfo *player)
   player->present = FALSE;
   player->active = FALSE;
 
+  // required for some CE actions (even if the player is not active anymore)
+  player->MovPos = 0;
+
   if (!ExplodeField[jx][jy])
     StorePlayer[jx][jy] = 0;
 
@@ -13397,23 +13678,22 @@ void RemovePlayer(struct PlayerInfo *player)
       found = TRUE;
 
   if (!found)
-    AllPlayersGone = TRUE;
+  {
+    game.all_players_gone = TRUE;
+    game.GameOver = TRUE;
+  }
 
-  ExitX = ZX = jx;
-  ExitY = ZY = jy;
+  game.exit_x = game.robot_wheel_x = jx;
+  game.exit_y = game.robot_wheel_y = jy;
 }
 
 void ExitPlayer(struct PlayerInfo *player)
 {
-  DrawPlayer(player);  /* needed here only to cleanup last field */
+  DrawPlayer(player);  // needed here only to cleanup last field
   RemovePlayer(player);
 
-  if (local_player->players_still_needed > 0)
-    local_player->players_still_needed--;
-
-  /* also set if some players not yet gone, but not needed to solve level */
-  if (local_player->players_still_needed == 0)
-    AllPlayersGone = TRUE;
+  if (game.players_still_needed > 0)
+    game.players_still_needed--;
 }
 
 static void setFieldForSnapping(int x, int y, int element, int direction)
@@ -13424,7 +13704,7 @@ static void setFieldForSnapping(int x, int y, int element, int direction)
   int action = (graphic_snapping != IMG_EMPTY_SPACE ? ACTION_SNAPPING :
                IS_DIGGABLE(element) ? ACTION_DIGGING : ACTION_COLLECTING);
 
-  Feld[x][y] = EL_ELEMENT_SNAPPING;
+  Tile[x][y] = EL_ELEMENT_SNAPPING;
   MovDelay[x][y] = MOVE_DELAY_NORMAL_SPEED + 1 - 1;
 
   ResetGfxAnimation(x, y);
@@ -13449,10 +13729,10 @@ static boolean checkDiagonalPushing(struct PlayerInfo *player,
 {
   int jx, jy, dx, dy, xx, yy;
 
-  if (real_dx == 0 || real_dy == 0)    /* no diagonal direction => push */
+  if (real_dx == 0 || real_dy == 0)    // no diagonal direction => push
     return TRUE;
 
-  /* diagonal direction: check alternative direction */
+  // diagonal direction: check alternative direction
   jx = player->jx;
   jy = player->jy;
   dx = x - jx;
@@ -13460,7 +13740,7 @@ static boolean checkDiagonalPushing(struct PlayerInfo *player,
   xx = jx + (dx == 0 ? real_dx : 0);
   yy = jy + (dy == 0 ? real_dy : 0);
 
-  return (!IN_LEV_FIELD(xx, yy) || IS_SOLID_FOR_PUSHING(Feld[xx][yy]));
+  return (!IN_LEV_FIELD(xx, yy) || IS_SOLID_FOR_PUSHING(Tile[xx][yy]));
 }
 
 /*
@@ -13489,11 +13769,11 @@ static int DigField(struct PlayerInfo *player,
                        dy == +1 ? MV_DOWN  : MV_NONE);
   int opposite_direction = MV_DIR_OPPOSITE(move_direction);
   int dig_side = MV_DIR_OPPOSITE(move_direction);
-  int old_element = Feld[jx][jy];
+  int old_element = Tile[jx][jy];
   int element = MovingOrBlocked2ElementIfNotLeaving(x, y);
   int collect_count;
 
-  if (is_player)               /* function can also be called by EL_PENGUIN */
+  if (is_player)               // function can also be called by EL_PENGUIN
   {
     if (player->MovPos == 0)
     {
@@ -13501,10 +13781,10 @@ static int DigField(struct PlayerInfo *player,
       player->is_collecting = FALSE;
     }
 
-    if (player->MovPos == 0)   /* last pushing move finished */
+    if (player->MovPos == 0)   // last pushing move finished
       player->is_pushing = FALSE;
 
-    if (mode == DF_NO_PUSH)    /* player just stopped pushing */
+    if (mode == DF_NO_PUSH)    // player just stopped pushing
     {
       player->is_switching = FALSE;
       player->push_delay = -1;
@@ -13516,22 +13796,22 @@ static int DigField(struct PlayerInfo *player,
   if (IS_TUBE(Back[jx][jy]) && game.engine_version >= VERSION_IDENT(2,2,0,0))
     old_element = Back[jx][jy];
 
-  /* in case of element dropped at player position, check background */
+  // in case of element dropped at player position, check background
   else if (Back[jx][jy] != EL_EMPTY &&
           game.engine_version >= VERSION_IDENT(2,2,0,0))
     old_element = Back[jx][jy];
 
   if (IS_WALKABLE(old_element) && !ACCESS_FROM(old_element, move_direction))
-    return MP_NO_ACTION;       /* field has no opening in this direction */
+    return MP_NO_ACTION;       // field has no opening in this direction
 
   if (IS_PASSABLE(old_element) && !ACCESS_FROM(old_element,opposite_direction))
-    return MP_NO_ACTION;       /* field has no opening in this direction */
+    return MP_NO_ACTION;       // field has no opening in this direction
 
   if (player_can_move && element == EL_ACID && move_direction == MV_DOWN)
   {
     SplashAcid(x, y);
 
-    Feld[jx][jy] = player->artwork_element;
+    Tile[jx][jy] = player->artwork_element;
     InitMovingField(jx, jy, MV_DOWN);
     Store[jx][jy] = EL_ACID;
     ContinueMoving(jx, jy);
@@ -13552,7 +13832,7 @@ static int DigField(struct PlayerInfo *player,
 
   collect_count = element_info[element].collect_count_initial;
 
-  if (!is_player && !IS_COLLECTIBLE(element))  /* penguin cannot collect it */
+  if (!is_player && !IS_COLLECTIBLE(element))  // penguin cannot collect it
     return MP_NO_ACTION;
 
   if (game.engine_version < VERSION_IDENT(2,2,0,0))
@@ -13569,7 +13849,7 @@ static int DigField(struct PlayerInfo *player,
     if (element == EL_DC_LANDMINE)
       Bang(x, y);
 
-    if (Feld[x][y] != element)         /* field changed by snapping */
+    if (Tile[x][y] != element)         // field changed by snapping
       return MP_ACTION;
 
     return MP_NO_ACTION;
@@ -13578,7 +13858,7 @@ static int DigField(struct PlayerInfo *player,
   if (player->gravity && is_player && !player->is_auto_moving &&
       canFallDown(player) && move_direction != MV_DOWN &&
       !canMoveToValidFieldWithGravity(jx, jy, move_direction))
-    return MP_NO_ACTION;       /* player cannot walk here due to gravity */
+    return MP_NO_ACTION;       // player cannot walk here due to gravity
 
   if (player_can_move &&
       IS_WALKABLE(element) && ACCESS_FROM(element, opposite_direction))
@@ -13610,14 +13890,14 @@ static int DigField(struct PlayerInfo *player,
             element == EL_SP_EXIT_OPEN ||
             element == EL_SP_EXIT_OPENING)
     {
-      sound_action = ACTION_PASSING;   /* player is passing exit */
+      sound_action = ACTION_PASSING;   // player is passing exit
     }
     else if (element == EL_EMPTY)
     {
-      sound_action = ACTION_MOVING;            /* nothing to walk on */
+      sound_action = ACTION_MOVING;            // nothing to walk on
     }
 
-    /* play sound from background or player, whatever is available */
+    // play sound from background or player, whatever is available
     if (element_info[sound_element].sound[sound_action] != SND_UNDEFINED)
       PlayLevelSoundElementAction(x, y, sound_element, sound_action);
     else
@@ -13627,9 +13907,9 @@ static int DigField(struct PlayerInfo *player,
           IS_PASSABLE(element) && canPassField(x, y, move_direction))
   {
     if (!ACCESS_FROM(element, opposite_direction))
-      return MP_NO_ACTION;     /* field not accessible from this direction */
+      return MP_NO_ACTION;     // field not accessible from this direction
 
-    if (CAN_MOVE(element))     /* only fixed elements can be passed! */
+    if (CAN_MOVE(element))     // only fixed elements can be passed!
       return MP_NO_ACTION;
 
     if (IS_EM_GATE(element))
@@ -13690,12 +13970,12 @@ static int DigField(struct PlayerInfo *player,
        player->gravity = FALSE;
     }
 
-    /* automatically move to the next field with double speed */
+    // automatically move to the next field with double speed
     player->programmed_action = move_direction;
 
     if (player->move_delay_reset_counter == 0)
     {
-      player->move_delay_reset_counter = 2;    /* two double speed steps */
+      player->move_delay_reset_counter = 2;    // two double speed steps
 
       DOUBLE_PLAYER_SPEED(player);
     }
@@ -13722,7 +14002,7 @@ static int DigField(struct PlayerInfo *player,
       if (level.block_snap_field)
        setFieldForSnapping(x, y, element, move_direction);
       else
-       TestIfElementTouchesCustomElement(x, y);        /* for empty space */
+       TestIfElementTouchesCustomElement(x, y);        // for empty space
 
       CheckTriggeredElementChangeByPlayer(x, y, element, CE_PLAYER_SNAPS_X,
                                          player->index_bit, dig_side);
@@ -13788,8 +14068,8 @@ static int DigField(struct PlayerInfo *player,
     {
       player->num_white_keys++;
 
-      /* display white keys? */
-      /* DrawGameDoorValues(); */
+      // display white keys?
+      // DrawGameDoorValues();
     }
     else if (IS_ENVELOPE(element))
     {
@@ -13808,7 +14088,7 @@ static int DigField(struct PlayerInfo *player,
       RedrawAllInvisibleElementsForMagnifier();
     }
     else if (IS_DROPPABLE(element) ||
-            IS_THROWABLE(element))     /* can be collected and dropped */
+            IS_THROWABLE(element))     // can be collected and dropped
     {
       int i;
 
@@ -13823,13 +14103,13 @@ static int DigField(struct PlayerInfo *player,
     }
     else if (collect_count > 0)
     {
-      local_player->gems_still_needed -= collect_count;
-      if (local_player->gems_still_needed < 0)
-       local_player->gems_still_needed = 0;
+      game.gems_still_needed -= collect_count;
+      if (game.gems_still_needed < 0)
+       game.gems_still_needed = 0;
 
       game.snapshot.collected_item = TRUE;
 
-      game_panel_controls[GAME_PANEL_GEMS].value = local_player->gems_still_needed;
+      game_panel_controls[GAME_PANEL_GEMS].value = game.gems_still_needed;
 
       DisplayGameControlValues();
     }
@@ -13846,7 +14126,7 @@ static int DigField(struct PlayerInfo *player,
       if (level.block_snap_field)
        setFieldForSnapping(x, y, element, move_direction);
       else
-       TestIfElementTouchesCustomElement(x, y);        /* for empty space */
+       TestIfElementTouchesCustomElement(x, y);        // for empty space
 
       CheckTriggeredElementChangeByPlayer(x, y, element, CE_PLAYER_SNAPS_X,
                                          player->index_bit, dig_side);
@@ -13877,7 +14157,7 @@ static int DigField(struct PlayerInfo *player,
            IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1))))))
       return MP_NO_ACTION;
 
-    /* do not push elements already moving away faster than player */
+    // do not push elements already moving away faster than player
     if (CAN_MOVE(element) && MovDir[x][y] == move_direction &&
        ABS(getElementMoveStepsize(x, y)) > MOVE_STEPSIZE_NORMAL)
       return MP_NO_ACTION;
@@ -13904,7 +14184,7 @@ static int DigField(struct PlayerInfo *player,
     if (!(IN_LEV_FIELD(nextx, nexty) &&
          (IS_FREE(nextx, nexty) ||
           (IS_SB_ELEMENT(element) &&
-           Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY) ||
+           Tile[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY) ||
           (IS_CUSTOM_ELEMENT(element) &&
            CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, nextx, nexty)))))
       return MP_NO_ACTION;
@@ -13912,14 +14192,14 @@ static int DigField(struct PlayerInfo *player,
     if (!checkDiagonalPushing(player, x, y, real_dx, real_dy))
       return MP_NO_ACTION;
 
-    if (player->push_delay == -1)      /* new pushing; restart delay */
+    if (player->push_delay == -1)      // new pushing; restart delay
       player->push_delay = 0;
 
     if (player->push_delay < player->push_delay_value &&
        !(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
        element != EL_SPRING && element != EL_BALLOON)
     {
-      /* make sure that there is no move delay before next try to push */
+      // make sure that there is no move delay before next try to push
       if (game.engine_version >= VERSION_IDENT(3,0,7,1))
        player->move_delay = 0;
 
@@ -13935,19 +14215,29 @@ static int DigField(struct PlayerInfo *player,
 
     if (IS_SB_ELEMENT(element))
     {
+      boolean sokoban_task_solved = FALSE;
+
       if (element == EL_SOKOBAN_FIELD_FULL)
       {
        Back[x][y] = EL_SOKOBAN_FIELD_EMPTY;
-       local_player->sokobanfields_still_needed++;
+
+       IncrementSokobanFieldsNeeded();
+       IncrementSokobanObjectsNeeded();
       }
 
-      if (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY)
+      if (Tile[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY)
       {
        Back[nextx][nexty] = EL_SOKOBAN_FIELD_EMPTY;
-       local_player->sokobanfields_still_needed--;
+
+       DecrementSokobanFieldsNeeded();
+       DecrementSokobanObjectsNeeded();
+
+       // sokoban object was pushed from empty field to sokoban field
+       if (Back[x][y] == EL_EMPTY)
+         sokoban_task_solved = TRUE;
       }
 
-      Feld[x][y] = EL_SOKOBAN_OBJECT;
+      Tile[x][y] = EL_SOKOBAN_OBJECT;
 
       if (Back[x][y] == Back[nextx][nexty])
        PlayLevelSoundAction(x, y, ACTION_PUSHING);
@@ -13958,12 +14248,14 @@ static int DigField(struct PlayerInfo *player,
        PlayLevelSoundElementAction(nextx, nexty, EL_SOKOBAN_FIELD_EMPTY,
                                    ACTION_FILLING);
 
-      if (local_player->sokobanfields_still_needed == 0 &&
+      if (sokoban_task_solved &&
+         game.sokoban_fields_still_needed == 0 &&
+         game.sokoban_objects_still_needed == 0 &&
          (game.emulation == EMU_SOKOBAN || level.auto_exit_sokoban))
       {
-       local_player->players_still_needed = 0;
+       game.players_still_needed = 0;
 
-       PlayerWins(player);
+       LevelSolved();
 
        PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING);
       }
@@ -13985,9 +14277,9 @@ static int DigField(struct PlayerInfo *player,
     if (game.engine_version < VERSION_IDENT(2,2,0,7))
       player->push_delay_value = GET_NEW_PUSH_DELAY(element);
     else
-      player->push_delay_value = -1;   /* get new value later */
+      player->push_delay_value = -1;   // get new value later
 
-    /* check for element change _after_ element has been pushed */
+    // check for element change _after_ element has been pushed
     if (game.use_change_when_pushing_bug)
     {
       CheckElementChangeByPlayer(x, y, element, CE_PUSHED_BY_PLAYER,
@@ -14014,10 +14306,10 @@ static int DigField(struct PlayerInfo *player,
 
     if (element == EL_ROBOT_WHEEL)
     {
-      Feld[x][y] = EL_ROBOT_WHEEL_ACTIVE;
-      ZX = x;
-      ZY = y;
+      Tile[x][y] = EL_ROBOT_WHEEL_ACTIVE;
 
+      game.robot_wheel_x = x;
+      game.robot_wheel_y = y;
       game.robot_wheel_active = TRUE;
 
       TEST_DrawLevelField(x, y);
@@ -14028,13 +14320,13 @@ static int DigField(struct PlayerInfo *player,
 
       SCAN_PLAYFIELD(xx, yy)
       {
-       if (Feld[xx][yy] == EL_SP_DISK_YELLOW)
+       if (Tile[xx][yy] == EL_SP_DISK_YELLOW)
        {
          Bang(xx, yy);
        }
-       else if (Feld[xx][yy] == EL_SP_TERMINAL)
+       else if (Tile[xx][yy] == EL_SP_TERMINAL)
        {
-         Feld[xx][yy] = EL_SP_TERMINAL_ACTIVE;
+         Tile[xx][yy] = EL_SP_TERMINAL_ACTIVE;
 
          ResetGfxAnimation(xx, yy);
          TEST_DrawLevelField(xx, yy);
@@ -14078,15 +14370,15 @@ static int DigField(struct PlayerInfo *player,
     }
     else if (element == EL_LAMP)
     {
-      Feld[x][y] = EL_LAMP_ACTIVE;
-      local_player->lights_still_needed--;
+      Tile[x][y] = EL_LAMP_ACTIVE;
+      game.lights_still_needed--;
 
       ResetGfxAnimation(x, y);
       TEST_DrawLevelField(x, y);
     }
     else if (element == EL_TIME_ORB_FULL)
     {
-      Feld[x][y] = EL_TIME_ORB_EMPTY;
+      Tile[x][y] = EL_TIME_ORB_EMPTY;
 
       if (level.time > 0 || level.use_time_orb_bug)
       {
@@ -14106,13 +14398,13 @@ static int DigField(struct PlayerInfo *player,
     {
       int xx, yy;
 
-      game.ball_state = !game.ball_state;
+      game.ball_active = !game.ball_active;
 
       SCAN_PLAYFIELD(xx, yy)
       {
-       int e = Feld[xx][yy];
+       int e = Tile[xx][yy];
 
-       if (game.ball_state)
+       if (game.ball_active)
        {
          if (e == EL_EMC_MAGIC_BALL)
            CreateField(xx, yy, EL_EMC_MAGIC_BALL_ACTIVE);
@@ -14169,9 +14461,9 @@ static int DigField(struct PlayerInfo *player,
 
   player->push_delay = -1;
 
-  if (is_player)               /* function can also be called by EL_PENGUIN */
+  if (is_player)               // function can also be called by EL_PENGUIN
   {
-    if (Feld[x][y] != element)         /* really digged/collected something */
+    if (Tile[x][y] != element)         // really digged/collected something
     {
       player->is_collecting = !player->is_digging;
       player->is_active = TRUE;
@@ -14183,7 +14475,7 @@ static int DigField(struct PlayerInfo *player,
 
 static boolean DigFieldByCE(int x, int y, int digging_element)
 {
-  int element = Feld[x][y];
+  int element = Tile[x][y];
 
   if (!IS_FREE(x, y))
   {
@@ -14191,7 +14483,7 @@ static boolean DigFieldByCE(int x, int y, int digging_element)
                  IS_COLLECTIBLE(element) ? ACTION_COLLECTING :
                  ACTION_BREAKING);
 
-    /* no element can dig solid indestructible elements */
+    // no element can dig solid indestructible elements
     if (IS_INDESTRUCTIBLE(element) &&
        !IS_DIGGABLE(element) &&
        !IS_COLLECTIBLE(element))
@@ -14214,7 +14506,7 @@ static boolean DigFieldByCE(int x, int y, int digging_element)
       TEST_DrawLevelField(x, y);
     }
 
-    /* if digged element was about to explode, prevent the explosion */
+    // if digged element was about to explode, prevent the explosion
     ExplodeField[x][y] = EX_TYPE_NONE;
 
     PlayLevelSoundAction(x, y, action);
@@ -14222,7 +14514,7 @@ static boolean DigFieldByCE(int x, int y, int digging_element)
 
   Store[x][y] = EL_EMPTY;
 
-  /* this makes it possible to leave the removed element again */
+  // this makes it possible to leave the removed element again
   if (IS_EQUAL_OR_IN_GROUP(element, MOVE_ENTER_EL(digging_element)))
     Store[x][y] = element;
 
@@ -14266,7 +14558,7 @@ static boolean SnapField(struct PlayerInfo *player, int dx, int dy)
     return FALSE;
   }
 
-  /* prevent snapping with already pressed snap key when not allowed */
+  // prevent snapping with already pressed snap key when not allowed
   if (player->is_snapping && !can_continue_snapping)
     return FALSE;
 
@@ -14296,7 +14588,7 @@ static boolean SnapField(struct PlayerInfo *player, int dx, int dy)
     player->is_collecting = FALSE;
   }
 
-  if (player->MovPos != 0)     /* prevent graphic bugs in versions < 2.2.0 */
+  if (player->MovPos != 0)     // prevent graphic bugs in versions < 2.2.0
     TEST_DrawLevelField(player->last_jx, player->last_jy);
 
   TEST_DrawLevelField(x, y);
@@ -14316,7 +14608,7 @@ static boolean DropElement(struct PlayerInfo *player)
      pressed without moving, dropped element must move away before the next
      element can be dropped (this is especially important if the next element
      is dynamite, which can be placed on background for historical reasons) */
-  if (PLAYER_DROPPING(player, dropx, dropy) && Feld[dropx][dropy] != EL_EMPTY)
+  if (PLAYER_DROPPING(player, dropx, dropy) && Tile[dropx][dropy] != EL_EMPTY)
     return MP_ACTION;
 
   if (IS_THROWABLE(drop_element))
@@ -14328,34 +14620,34 @@ static boolean DropElement(struct PlayerInfo *player)
       return FALSE;
   }
 
-  old_element = Feld[dropx][dropy];    /* old element at dropping position */
-  new_element = drop_element;          /* default: no change when dropping */
+  old_element = Tile[dropx][dropy];    // old element at dropping position
+  new_element = drop_element;          // default: no change when dropping
 
-  /* check if player is active, not moving and ready to drop */
+  // check if player is active, not moving and ready to drop
   if (!player->active || player->MovPos || player->drop_delay > 0)
     return FALSE;
 
-  /* check if player has anything that can be dropped */
+  // check if player has anything that can be dropped
   if (new_element == EL_UNDEFINED)
     return FALSE;
 
-  /* only set if player has anything that can be dropped */
+  // only set if player has anything that can be dropped
   player->is_dropping_pressed = TRUE;
 
-  /* check if drop key was pressed long enough for EM style dynamite */
+  // check if drop key was pressed long enough for EM style dynamite
   if (new_element == EL_EM_DYNAMITE && player->drop_pressed_delay < 40)
     return FALSE;
 
-  /* check if anything can be dropped at the current position */
+  // check if anything can be dropped at the current position
   if (IS_ACTIVE_BOMB(old_element) || old_element == EL_EXPLOSION)
     return FALSE;
 
-  /* collected custom elements can only be dropped on empty fields */
+  // collected custom elements can only be dropped on empty fields
   if (IS_CUSTOM_ELEMENT(new_element) && old_element != EL_EMPTY)
     return FALSE;
 
   if (old_element != EL_EMPTY)
-    Back[dropx][dropy] = old_element;  /* store old element on this field */
+    Back[dropx][dropy] = old_element;  // store old element on this field
 
   ResetGfxAnimation(dropx, dropy);
   ResetRandomAnimationValue(dropx, dropy);
@@ -14377,16 +14669,16 @@ static boolean DropElement(struct PlayerInfo *player)
        new_element = EL_SP_DISK_RED_ACTIVE;
     }
 
-    Feld[dropx][dropy] = new_element;
+    Tile[dropx][dropy] = new_element;
 
     if (IN_SCR_FIELD(SCREENX(dropx), SCREENY(dropy)))
       DrawGraphicThruMask(SCREENX(dropx), SCREENY(dropy),
-                         el2img(Feld[dropx][dropy]), 0);
+                         el2img(Tile[dropx][dropy]), 0);
 
     PlayLevelSoundAction(dropx, dropy, ACTION_DROPPING);
 
-    /* needed if previous element just changed to "empty" in the last frame */
-    ChangeCount[dropx][dropy] = 0;     /* allow at least one more change */
+    // needed if previous element just changed to "empty" in the last frame
+    ChangeCount[dropx][dropy] = 0;     // allow at least one more change
 
     CheckElementChangeByPlayer(dropx, dropy, new_element, CE_DROPPED_BY_PLAYER,
                               player->index_bit, drop_side);
@@ -14396,23 +14688,23 @@ static boolean DropElement(struct PlayerInfo *player)
 
     TestIfElementTouchesCustomElement(dropx, dropy);
   }
-  else         /* player is dropping a dyna bomb */
+  else         // player is dropping a dyna bomb
   {
     player->dynabombs_left--;
 
-    Feld[dropx][dropy] = new_element;
+    Tile[dropx][dropy] = new_element;
 
     if (IN_SCR_FIELD(SCREENX(dropx), SCREENY(dropy)))
       DrawGraphicThruMask(SCREENX(dropx), SCREENY(dropy),
-                         el2img(Feld[dropx][dropy]), 0);
+                         el2img(Tile[dropx][dropy]), 0);
 
     PlayLevelSoundAction(dropx, dropy, ACTION_DROPPING);
   }
 
-  if (Feld[dropx][dropy] == new_element) /* uninitialized unless CE change */
+  if (Tile[dropx][dropy] == new_element) // uninitialized unless CE change
     InitField_WithBug1(dropx, dropy, FALSE);
 
-  new_element = Feld[dropx][dropy];    /* element might have changed */
+  new_element = Tile[dropx][dropy];    // element might have changed
 
   if (IS_CUSTOM_ELEMENT(new_element) && CAN_MOVE(new_element) &&
       element_info[new_element].move_pattern == MV_WHEN_DROPPED)
@@ -14420,9 +14712,9 @@ static boolean DropElement(struct PlayerInfo *player)
     if (element_info[new_element].move_direction_initial == MV_START_AUTOMATIC)
       MovDir[dropx][dropy] = drop_direction;
 
-    ChangeCount[dropx][dropy] = 0;     /* allow at least one more change */
+    ChangeCount[dropx][dropy] = 0;     // allow at least one more change
 
-    /* do not cause impact style collision by dropping elements that can fall */
+    // do not cause impact style collision by dropping elements that can fall
     CheckCollision[dropx][dropy] = CHECK_DELAY_COLLISION;
   }
 
@@ -14438,9 +14730,9 @@ static boolean DropElement(struct PlayerInfo *player)
   return TRUE;
 }
 
-/* ------------------------------------------------------------------------- */
-/* game sound playing functions                                              */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// game sound playing functions
+// ----------------------------------------------------------------------------
 
 static int *loop_sound_frame = NULL;
 static int *loop_sound_volume = NULL;
@@ -14512,7 +14804,7 @@ static void PlayLevelSoundNearest(int x, int y, int sound_action)
 
 static void PlayLevelSoundAction(int x, int y, int action)
 {
-  PlayLevelSoundElementAction(x, y, Feld[x][y], action);
+  PlayLevelSoundElementAction(x, y, Tile[x][y], action);
 }
 
 static void PlayLevelSoundElementAction(int x, int y, int element, int action)
@@ -14534,7 +14826,7 @@ static void PlayLevelSoundElementActionIfLoop(int x, int y, int element,
 
 static void PlayLevelSoundActionIfLoop(int x, int y, int action)
 {
-  int sound_effect = element_info[SND_ELEMENT(Feld[x][y])].sound[action];
+  int sound_effect = element_info[SND_ELEMENT(Tile[x][y])].sound[action];
 
   if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect))
     PlayLevelSound(x, y, sound_effect);
@@ -14542,7 +14834,7 @@ static void PlayLevelSoundActionIfLoop(int x, int y, int action)
 
 static void StopLevelSoundActionIfLoop(int x, int y, int action)
 {
-  int sound_effect = element_info[SND_ELEMENT(Feld[x][y])].sound[action];
+  int sound_effect = element_info[SND_ELEMENT(Tile[x][y])].sound[action];
 
   if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect))
     StopSound(sound_effect);
@@ -14551,9 +14843,9 @@ static void StopLevelSoundActionIfLoop(int x, int y, int action)
 static int getLevelMusicNr(void)
 {
   if (levelset.music[level_nr] != MUS_UNDEFINED)
-    return levelset.music[level_nr];           /* from config file */
+    return levelset.music[level_nr];           // from config file
   else
-    return MAP_NOCONF_MUSIC(level_nr);         /* from music dir */
+    return MAP_NOCONF_MUSIC(level_nr);         // from music dir
 }
 
 static void FadeLevelSounds(void)
@@ -14589,79 +14881,79 @@ static void PlayLevelMusic(void)
 
 void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)
 {
-  int element = (element_em > -1 ? map_element_EM_to_RND(element_em) : 0);
-  int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
-  int x = xx - 1 - offset;
-  int y = yy - 1 - offset;
+  int element = (element_em > -1 ? map_element_EM_to_RND_game(element_em) : 0);
+  int offset = 0;
+  int x = xx - offset;
+  int y = yy - offset;
 
   switch (sample)
   {
-    case SAMPLE_blank:
+    case SOUND_blank:
       PlayLevelSoundElementAction(x, y, element, ACTION_WALKING);
       break;
 
-    case SAMPLE_roll:
+    case SOUND_roll:
       PlayLevelSoundElementAction(x, y, element, ACTION_PUSHING);
       break;
 
-    case SAMPLE_stone:
+    case SOUND_stone:
       PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
       break;
 
-    case SAMPLE_nut:
+    case SOUND_nut:
       PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
       break;
 
-    case SAMPLE_crack:
+    case SOUND_crack:
       PlayLevelSoundElementAction(x, y, element, ACTION_BREAKING);
       break;
 
-    case SAMPLE_bug:
+    case SOUND_bug:
       PlayLevelSoundElementAction(x, y, element, ACTION_MOVING);
       break;
 
-    case SAMPLE_tank:
+    case SOUND_tank:
       PlayLevelSoundElementAction(x, y, element, ACTION_MOVING);
       break;
 
-    case SAMPLE_android_clone:
+    case SOUND_android_clone:
       PlayLevelSoundElementAction(x, y, element, ACTION_DROPPING);
       break;
 
-    case SAMPLE_android_move:
+    case SOUND_android_move:
       PlayLevelSoundElementAction(x, y, element, ACTION_MOVING);
       break;
 
-    case SAMPLE_spring:
+    case SOUND_spring:
       PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
       break;
 
-    case SAMPLE_slurp:
+    case SOUND_slurp:
       PlayLevelSoundElementAction(x, y, element, ACTION_EATING);
       break;
 
-    case SAMPLE_eater:
+    case SOUND_eater:
       PlayLevelSoundElementAction(x, y, element, ACTION_WAITING);
       break;
 
-    case SAMPLE_eater_eat:
+    case SOUND_eater_eat:
       PlayLevelSoundElementAction(x, y, element, ACTION_DIGGING);
       break;
 
-    case SAMPLE_alien:
+    case SOUND_alien:
       PlayLevelSoundElementAction(x, y, element, ACTION_MOVING);
       break;
 
-    case SAMPLE_collect:
+    case SOUND_collect:
       PlayLevelSoundElementAction(x, y, element, ACTION_COLLECTING);
       break;
 
-    case SAMPLE_diamond:
+    case SOUND_diamond:
       PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
       break;
 
-    case SAMPLE_squash:
-      /* !!! CHECK THIS !!! */
+    case SOUND_squash:
+      // !!! CHECK THIS !!!
 #if 1
       PlayLevelSoundElementAction(x, y, element, ACTION_BREAKING);
 #else
@@ -14669,75 +14961,75 @@ void PlayLevelSound_EM(int xx, int yy, int element_em, int sample)
 #endif
       break;
 
-    case SAMPLE_wonderfall:
+    case SOUND_wonderfall:
       PlayLevelSoundElementAction(x, y, element, ACTION_FILLING);
       break;
 
-    case SAMPLE_drip:
+    case SOUND_drip:
       PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
       break;
 
-    case SAMPLE_push:
+    case SOUND_push:
       PlayLevelSoundElementAction(x, y, element, ACTION_PUSHING);
       break;
 
-    case SAMPLE_dirt:
+    case SOUND_dirt:
       PlayLevelSoundElementAction(x, y, element, ACTION_DIGGING);
       break;
 
-    case SAMPLE_acid:
+    case SOUND_acid:
       PlayLevelSoundElementAction(x, y, element, ACTION_SPLASHING);
       break;
 
-    case SAMPLE_ball:
+    case SOUND_ball:
       PlayLevelSoundElementAction(x, y, element, ACTION_DROPPING);
       break;
 
-    case SAMPLE_grow:
+    case SOUND_slide:
       PlayLevelSoundElementAction(x, y, element, ACTION_GROWING);
       break;
 
-    case SAMPLE_wonder:
+    case SOUND_wonder:
       PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVE);
       break;
 
-    case SAMPLE_door:
+    case SOUND_door:
       PlayLevelSoundElementAction(x, y, element, ACTION_PASSING);
       break;
 
-    case SAMPLE_exit_open:
+    case SOUND_exit_open:
       PlayLevelSoundElementAction(x, y, element, ACTION_OPENING);
       break;
 
-    case SAMPLE_exit_leave:
+    case SOUND_exit_leave:
       PlayLevelSoundElementAction(x, y, element, ACTION_PASSING);
       break;
 
-    case SAMPLE_dynamite:
+    case SOUND_dynamite:
       PlayLevelSoundElementAction(x, y, element, ACTION_DROPPING);
       break;
 
-    case SAMPLE_tick:
+    case SOUND_tick:
       PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVE);
       break;
 
-    case SAMPLE_press:
+    case SOUND_press:
       PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVATING);
       break;
 
-    case SAMPLE_wheel:
+    case SOUND_wheel:
       PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVE);
       break;
 
-    case SAMPLE_boom:
+    case SOUND_boom:
       PlayLevelSoundElementAction(x, y, element, ACTION_EXPLODING);
       break;
 
-    case SAMPLE_die:
+    case SOUND_die:
       PlayLevelSoundElementAction(x, y, element, ACTION_DYING);
       break;
 
-    case SAMPLE_time:
+    case SOUND_time:
       PlaySound(SND_GAME_RUNNING_OUT_OF_TIME);
       break;
 
@@ -14804,9 +15096,9 @@ void StopSound_MM(int sound_mm)
 
 void RaiseScore(int value)
 {
-  local_player->score += value;
+  game.score += value;
 
-  game_panel_controls[GAME_PANEL_SCORE].value = local_player->score;
+  game_panel_controls[GAME_PANEL_SCORE].value = game.score;
 
   DisplayGameControlValues();
 }
@@ -14895,9 +15187,14 @@ void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
 {
   if (skip_request || Request(message, REQ_ASK | REQ_STAY_CLOSED))
   {
-    /* closing door required in case of envelope style request dialogs */
+    // closing door required in case of envelope style request dialogs
     if (!skip_request)
+    {
+      // prevent short reactivation of overlay buttons while closing door
+      SetOverlayActive(FALSE);
+
       CloseDoor(DOOR_CLOSE_1);
+    }
 
     if (network.enabled)
       SendToServer_StopPlaying(NETWORK_STOP_BY_PLAYER);
@@ -14911,7 +15208,7 @@ void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
       DrawMainMenu();
     }
   }
-  else         /* continue playing the game */
+  else         // continue playing the game
   {
     if (tape.playing && tape.deactivate_display)
       TapeDeactivateDisplayOff(TRUE);
@@ -14926,7 +15223,7 @@ void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
 void RequestQuitGame(boolean ask_if_really_quit)
 {
   boolean quick_quit = (!ask_if_really_quit || level_editor_test_game);
-  boolean skip_request = AllPlayersGone || quick_quit;
+  boolean skip_request = game.all_players_gone || quick_quit;
 
   RequestQuitGameExt(skip_request, quick_quit,
                     "Do you really want to quit the game?");
@@ -14936,7 +15233,10 @@ void RequestRestartGame(char *message)
 {
   game.restart_game_message = NULL;
 
-  if (Request(message, REQ_ASK | REQ_STAY_CLOSED))
+  boolean has_started_game = hasStartedNetworkGame();
+  int request_mode = (has_started_game ? REQ_ASK : REQ_CONFIRM);
+
+  if (Request(message, request_mode | REQ_STAY_CLOSED) && has_started_game)
   {
     StartGameActions(network.enabled, setup.autorecord, level.random_seed);
   }
@@ -14948,10 +15248,71 @@ void RequestRestartGame(char *message)
   }
 }
 
+void CheckGameOver(void)
+{
+  static boolean last_game_over = FALSE;
+  static int game_over_delay = 0;
+  int game_over_delay_value = 50;
+  boolean game_over = checkGameFailed();
+
+  // do not handle game over if request dialog is already active
+  if (game.request_active)
+    return;
+
+  // do not ask to play again if game was never actually played
+  if (!game.GamePlayed)
+    return;
+
+  if (!game_over)
+  {
+    last_game_over = FALSE;
+    game_over_delay = game_over_delay_value;
+
+    return;
+  }
 
-/* ------------------------------------------------------------------------- */
-/* random generator functions                                                */
-/* ------------------------------------------------------------------------- */
+  if (game_over_delay > 0)
+  {
+    game_over_delay--;
+
+    return;
+  }
+
+  if (last_game_over != game_over)
+    game.restart_game_message = (hasStartedNetworkGame() ?
+                                "Game over! Play it again?" :
+                                "Game over!");
+
+  last_game_over = game_over;
+}
+
+boolean checkGameSolved(void)
+{
+  // set for all game engines if level was solved
+  return game.LevelSolved_GameEnd;
+}
+
+boolean checkGameFailed(void)
+{
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    return (game_em.game_over && !game_em.level_solved);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    return (game_sp.game_over && !game_sp.level_solved);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return (game_mm.game_over && !game_mm.level_solved);
+  else                         // GAME_ENGINE_TYPE_RND
+    return (game.GameOver && !game.LevelSolved);
+}
+
+boolean checkGameEnded(void)
+{
+  return (checkGameSolved() || checkGameFailed());
+}
+
+
+// ----------------------------------------------------------------------------
+// random generator functions
+// ----------------------------------------------------------------------------
 
 unsigned int InitEngineRandom_RND(int seed)
 {
@@ -14973,19 +15334,19 @@ unsigned int RND(int max)
 }
 
 
-/* ------------------------------------------------------------------------- */
-/* game engine snapshot handling functions                                   */
-/* ------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// game engine snapshot handling functions
+// ----------------------------------------------------------------------------
 
 struct EngineSnapshotInfo
 {
-  /* runtime values for custom element collect score */
+  // runtime values for custom element collect score
   int collect_score[NUM_CUSTOM_ELEMENTS];
 
-  /* runtime values for group element choice position */
+  // runtime values for group element choice position
   int choice_pos[NUM_GROUP_ELEMENTS];
 
-  /* runtime values for belt position animations */
+  // runtime values for belt position animations
   int belt_graphic[4][NUM_BELT_PARTS];
   int belt_anim_mode[4][NUM_BELT_PARTS];
 };
@@ -15072,10 +15433,11 @@ static void LoadEngineSnapshotValues_RND(void)
 
   if (game.num_random_calls != num_random_calls)
   {
-    Error(ERR_INFO, "number of random calls out of sync");
-    Error(ERR_INFO, "number of random calls should be %d", num_random_calls);
-    Error(ERR_INFO, "number of random calls is %d", game.num_random_calls);
-    Error(ERR_EXIT, "this should not happen -- please debug");
+    Error("number of random calls out of sync");
+    Error("number of random calls should be %d", num_random_calls);
+    Error("number of random calls is %d", game.num_random_calls);
+
+    Fail("this should not happen -- please debug");
   }
 }
 
@@ -15096,7 +15458,7 @@ static ListNode *SaveEngineSnapshotBuffers(void)
 {
   ListNode *buffers = NULL;
 
-  /* copy some special values to a structure better suited for the snapshot */
+  // copy some special values to a structure better suited for the snapshot
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
     SaveEngineSnapshotValues_RND();
@@ -15107,7 +15469,7 @@ static ListNode *SaveEngineSnapshotBuffers(void)
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     SaveEngineSnapshotValues_MM(&buffers);
 
-  /* save values stored in special snapshot structure */
+  // save values stored in special snapshot structure
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
     SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(engine_snapshot_rnd));
@@ -15118,17 +15480,12 @@ static ListNode *SaveEngineSnapshotBuffers(void)
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(engine_snapshot_mm));
 
-  /* save further RND engine values */
+  // save further RND engine values
 
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(stored_player));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(game));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(tape));
 
-  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(ZX));
-  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(ZY));
-  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(ExitX));
-  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(ExitY));
-
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(FrameCounter));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(TimeFrames));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(TimePlayed));
@@ -15141,12 +15498,10 @@ static ListNode *SaveEngineSnapshotBuffers(void)
 
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(ScrollStepSize));
 
-  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(AllPlayersGone));
-
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(AmoebaCnt));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(AmoebaCnt2));
 
-  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(Feld));
+  SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(Tile));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(MovPos));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(MovDir));
   SaveSnapshotBuffer(&buffers, ARGS_ADDRESS_AND_SIZEOF(MovDelay));
@@ -15195,7 +15550,8 @@ static ListNode *SaveEngineSnapshotBuffers(void)
     node = node->next;
   }
 
-  printf("::: size of engine snapshot: %d bytes\n", num_bytes);
+  Debug("game:playing:SaveEngineSnapshotBuffers",
+       "size of engine snapshot: %d bytes", num_bytes);
 #endif
 
   return buffers;
@@ -15205,10 +15561,10 @@ void SaveEngineSnapshotSingle(void)
 {
   ListNode *buffers = SaveEngineSnapshotBuffers();
 
-  /* finally save all snapshot buffers to single snapshot */
+  // finally save all snapshot buffers to single snapshot
   SaveSnapshotSingle(buffers);
 
-  /* save level identification information */
+  // save level identification information
   setString(&snapshot_level_identifier, leveldir_current->identifier);
   snapshot_level_nr = level_nr;
 }
@@ -15237,7 +15593,7 @@ void SaveEngineSnapshotToList(void)
 
   ListNode *buffers = SaveEngineSnapshotBuffers();
 
-  /* finally save all snapshot buffers to snapshot list */
+  // finally save all snapshot buffers to snapshot list
   SaveSnapshotToList(buffers);
 }
 
@@ -15250,7 +15606,7 @@ void SaveEngineSnapshotToListInitial(void)
 
 static void LoadEngineSnapshotValues(void)
 {
-  /* restore special values from snapshot structure */
+  // restore special values from snapshot structure
 
   if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
     LoadEngineSnapshotValues_RND();
@@ -15295,7 +15651,7 @@ boolean CheckEngineSnapshotList(void)
 }
 
 
-/* ---------- new game button stuff ---------------------------------------- */
+// ---------- new game button stuff -------------------------------------------
 
 static struct
 {
@@ -15304,93 +15660,104 @@ static struct
   int gadget_id;
   boolean *setup_value;
   boolean allowed_on_tape;
+  boolean is_touch_button;
   char *infotext;
 } gamebutton_info[NUM_GAME_BUTTONS] =
 {
   {
     IMG_GFX_GAME_BUTTON_STOP,                  &game.button.stop,
     GAME_CTRL_ID_STOP,                         NULL,
-    TRUE,                                      "stop game"
+    TRUE, FALSE,                               "stop game"
   },
   {
     IMG_GFX_GAME_BUTTON_PAUSE,                 &game.button.pause,
     GAME_CTRL_ID_PAUSE,                                NULL,
-    TRUE,                                      "pause game"
+    TRUE, FALSE,                               "pause game"
   },
   {
     IMG_GFX_GAME_BUTTON_PLAY,                  &game.button.play,
     GAME_CTRL_ID_PLAY,                         NULL,
-    TRUE,                                      "play game"
+    TRUE, FALSE,                               "play game"
   },
   {
     IMG_GFX_GAME_BUTTON_UNDO,                  &game.button.undo,
     GAME_CTRL_ID_UNDO,                         NULL,
-    TRUE,                                      "undo step"
+    TRUE, FALSE,                               "undo step"
   },
   {
     IMG_GFX_GAME_BUTTON_REDO,                  &game.button.redo,
     GAME_CTRL_ID_REDO,                         NULL,
-    TRUE,                                      "redo step"
+    TRUE, FALSE,                               "redo step"
   },
   {
     IMG_GFX_GAME_BUTTON_SAVE,                  &game.button.save,
     GAME_CTRL_ID_SAVE,                         NULL,
-    TRUE,                                      "save game"
+    TRUE, FALSE,                               "save game"
   },
   {
     IMG_GFX_GAME_BUTTON_PAUSE2,                        &game.button.pause2,
     GAME_CTRL_ID_PAUSE2,                       NULL,
-    TRUE,                                      "pause game"
+    TRUE, FALSE,                               "pause game"
   },
   {
     IMG_GFX_GAME_BUTTON_LOAD,                  &game.button.load,
     GAME_CTRL_ID_LOAD,                         NULL,
-    TRUE,                                      "load game"
+    TRUE, FALSE,                               "load game"
   },
   {
     IMG_GFX_GAME_BUTTON_PANEL_STOP,            &game.button.panel_stop,
     GAME_CTRL_ID_PANEL_STOP,                   NULL,
-    FALSE,                                     "stop game"
+    FALSE, FALSE,                              "stop game"
   },
   {
     IMG_GFX_GAME_BUTTON_PANEL_PAUSE,           &game.button.panel_pause,
     GAME_CTRL_ID_PANEL_PAUSE,                  NULL,
-    FALSE,                                     "pause game"
+    FALSE, FALSE,                              "pause game"
   },
   {
     IMG_GFX_GAME_BUTTON_PANEL_PLAY,            &game.button.panel_play,
     GAME_CTRL_ID_PANEL_PLAY,                   NULL,
-    FALSE,                                     "play game"
+    FALSE, FALSE,                              "play game"
+  },
+  {
+    IMG_GFX_GAME_BUTTON_TOUCH_STOP,            &game.button.touch_stop,
+    GAME_CTRL_ID_TOUCH_STOP,                   NULL,
+    FALSE, TRUE,                               "stop game"
+  },
+  {
+    IMG_GFX_GAME_BUTTON_TOUCH_PAUSE,           &game.button.touch_pause,
+    GAME_CTRL_ID_TOUCH_PAUSE,                  NULL,
+    FALSE, TRUE,                               "pause game"
   },
   {
     IMG_GFX_GAME_BUTTON_SOUND_MUSIC,           &game.button.sound_music,
     SOUND_CTRL_ID_MUSIC,                       &setup.sound_music,
-    TRUE,                                      "background music on/off"
+    TRUE, FALSE,                               "background music on/off"
   },
   {
     IMG_GFX_GAME_BUTTON_SOUND_LOOPS,           &game.button.sound_loops,
     SOUND_CTRL_ID_LOOPS,                       &setup.sound_loops,
-    TRUE,                                      "sound loops on/off"
+    TRUE, FALSE,                               "sound loops on/off"
   },
   {
     IMG_GFX_GAME_BUTTON_SOUND_SIMPLE,          &game.button.sound_simple,
     SOUND_CTRL_ID_SIMPLE,                      &setup.sound_simple,
-    TRUE,                                      "normal sounds on/off"
+    TRUE, FALSE,                               "normal sounds on/off"
   },
   {
     IMG_GFX_GAME_BUTTON_PANEL_SOUND_MUSIC,     &game.button.panel_sound_music,
     SOUND_CTRL_ID_PANEL_MUSIC,                 &setup.sound_music,
-    FALSE,                                     "background music on/off"
+    FALSE, FALSE,                              "background music on/off"
   },
   {
     IMG_GFX_GAME_BUTTON_PANEL_SOUND_LOOPS,     &game.button.panel_sound_loops,
     SOUND_CTRL_ID_PANEL_LOOPS,                 &setup.sound_loops,
-    FALSE,                                     "sound loops on/off"
+    FALSE, FALSE,                              "sound loops on/off"
   },
   {
     IMG_GFX_GAME_BUTTON_PANEL_SOUND_SIMPLE,    &game.button.panel_sound_simple,
     SOUND_CTRL_ID_PANEL_SIMPLE,                        &setup.sound_simple,
-    FALSE,                                     "normal sounds on/off"
+    FALSE, FALSE,                              "normal sounds on/off"
   }
 };
 
@@ -15407,10 +15774,11 @@ void CreateGameButtons(void)
     int button_type;
     boolean checked;
     unsigned int event_mask;
+    boolean is_touch_button = gamebutton_info[i].is_touch_button;
     boolean allowed_on_tape = gamebutton_info[i].allowed_on_tape;
     boolean on_tape = (tape.show_game_buttons && allowed_on_tape);
-    int base_x = (on_tape ? VX : DX);
-    int base_y = (on_tape ? VY : DY);
+    int base_x = (is_touch_button ? 0 : on_tape ? VX : DX);
+    int base_y = (is_touch_button ? 0 : on_tape ? VY : DY);
     int gd_x   = gfx->src_x;
     int gd_y   = gfx->src_y;
     int gd_xp  = gfx->src_x + gfx->pressed_xoffset;
@@ -15419,6 +15787,8 @@ void CreateGameButtons(void)
     int gd_ya  = gfx->src_y + gfx->active_yoffset;
     int gd_xap = gfx->src_x + gfx->active_xoffset + gfx->pressed_xoffset;
     int gd_yap = gfx->src_y + gfx->active_yoffset + gfx->pressed_yoffset;
+    int x = (is_touch_button ? pos->x : GDI_ACTIVE_POS(pos->x));
+    int y = (is_touch_button ? pos->y : GDI_ACTIVE_POS(pos->y));
     int id = i;
 
     if (gfx->bitmap == NULL)
@@ -15430,6 +15800,7 @@ void CreateGameButtons(void)
 
     if (id == GAME_CTRL_ID_STOP ||
        id == GAME_CTRL_ID_PANEL_STOP ||
+       id == GAME_CTRL_ID_TOUCH_STOP ||
        id == GAME_CTRL_ID_PLAY ||
        id == GAME_CTRL_ID_PANEL_PLAY ||
        id == GAME_CTRL_ID_SAVE ||
@@ -15457,8 +15828,8 @@ void CreateGameButtons(void)
     gi = CreateGadget(GDI_CUSTOM_ID, id,
                      GDI_IMAGE_ID, graphic,
                      GDI_INFO_TEXT, gamebutton_info[i].infotext,
-                     GDI_X, base_x + GDI_ACTIVE_POS(pos->x),
-                     GDI_Y, base_y + GDI_ACTIVE_POS(pos->y),
+                     GDI_X, base_x + x,
+                     GDI_Y, base_y + y,
                      GDI_WIDTH, gfx->width,
                      GDI_HEIGHT, gfx->height,
                      GDI_TYPE, button_type,
@@ -15469,12 +15840,13 @@ void CreateGameButtons(void)
                      GDI_ALT_DESIGN_UNPRESSED, gfx->bitmap, gd_xa, gd_ya,
                      GDI_ALT_DESIGN_PRESSED, gfx->bitmap, gd_xap, gd_yap,
                      GDI_DIRECT_DRAW, FALSE,
+                     GDI_OVERLAY_TOUCH_BUTTON, is_touch_button,
                      GDI_EVENT_MASK, event_mask,
                      GDI_CALLBACK_ACTION, HandleGameButtons,
                      GDI_END);
 
     if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
+      Fail("cannot create gadget");
 
     game_gadget[id] = gi;
   }
@@ -15539,8 +15911,6 @@ void MapUndoRedoButtons(void)
 
   MapGadget(game_gadget[GAME_CTRL_ID_UNDO]);
   MapGadget(game_gadget[GAME_CTRL_ID_REDO]);
-
-  ModifyGadget(game_gadget[GAME_CTRL_ID_PAUSE2], GDI_CHECKED, TRUE, GDI_END);
 }
 
 void UnmapUndoRedoButtons(void)
@@ -15550,8 +15920,22 @@ void UnmapUndoRedoButtons(void)
 
   MapGameButtonsAtSamePosition(GAME_CTRL_ID_UNDO);
   MapGameButtonsAtSamePosition(GAME_CTRL_ID_REDO);
+}
 
-  ModifyGadget(game_gadget[GAME_CTRL_ID_PAUSE2], GDI_CHECKED, FALSE, GDI_END);
+void ModifyPauseButtons(void)
+{
+  static int ids[] =
+  {
+    GAME_CTRL_ID_PAUSE,
+    GAME_CTRL_ID_PAUSE2,
+    GAME_CTRL_ID_PANEL_PAUSE,
+    GAME_CTRL_ID_TOUCH_PAUSE,
+    -1
+  };
+  int i;
+
+  for (i = 0; ids[i] > -1; i++)
+    ModifyGadget(game_gadget[ids[i]], GDI_CHECKED, tape.pausing, GDI_END);
 }
 
 static void MapGameButtonsExt(boolean on_tape)
@@ -15585,9 +15969,6 @@ static void RedrawGameButtonsExt(boolean on_tape)
   for (i = 0; i < NUM_GAME_BUTTONS; i++)
     if (!on_tape || gamebutton_info[i].allowed_on_tape)
       RedrawGadget(game_gadget[i]);
-
-  // RedrawGadget() may have set REDRAW_ALL if buttons are defined off-area
-  redraw_mask &= ~REDRAW_ALL;
 }
 
 static void SetGadgetState(struct GadgetInfo *gi, boolean state)
@@ -15694,6 +16075,7 @@ static void HandleGameButtonsExt(int id, int button)
   {
     case GAME_CTRL_ID_STOP:
     case GAME_CTRL_ID_PANEL_STOP:
+    case GAME_CTRL_ID_TOUCH_STOP:
       if (game_status == GAME_MODE_MAIN)
        break;
 
@@ -15707,6 +16089,7 @@ static void HandleGameButtonsExt(int id, int button)
     case GAME_CTRL_ID_PAUSE:
     case GAME_CTRL_ID_PAUSE2:
     case GAME_CTRL_ID_PANEL_PAUSE:
+    case GAME_CTRL_ID_TOUCH_PAUSE:
       if (network.enabled && game_status == GAME_MODE_PLAYING)
       {
        if (tape.pausing)