added configurability of different window size for title screens
[rocksndiamonds.git] / src / tools.c
index 0387f05d4cba20ff90ad5e5cf08fe423dc6895ca..3cf3b9609618d50b46346dba54d7bed7c7f32937 100644 (file)
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2006 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* tools.c                                                  *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// tools.c
+// ============================================================================
 
 #include <math.h>
 
@@ -229,55 +227,20 @@ void DumpTile(int x, int y)
   printf("  CustomValue: %d\n", CustomValue[x][y]);
   printf("  GfxElement:  %d\n", GfxElement[x][y]);
   printf("  GfxAction:   %d\n", GfxAction[x][y]);
-  printf("  GfxFrame:    %d\n", GfxFrame[x][y]);
+  printf("  GfxFrame:    %d [%d]\n", GfxFrame[x][y], FrameCounter);
   printf("\n");
 }
 
 void SetDrawtoField(int mode)
 {
-  if (mode == DRAW_BUFFERED && setup.soft_scrolling)
+  if (mode == DRAW_FIELDBUFFER)
   {
-#if NEW_TILESIZE
-#if NEW_SCROLL
     FX = 2 * TILEX_VAR;
     FY = 2 * TILEY_VAR;
     BX1 = -2;
     BY1 = -2;
     BX2 = SCR_FIELDX + 1;
     BY2 = SCR_FIELDY + 1;
-    redraw_x1 = 2;
-    redraw_y1 = 2;
-#else
-    FX = TILEX_VAR;
-    FY = TILEY_VAR;
-    BX1 = -1;
-    BY1 = -1;
-    BX2 = SCR_FIELDX;
-    BY2 = SCR_FIELDY;
-    redraw_x1 = 1;
-    redraw_y1 = 1;
-#endif
-#else
-#if NEW_SCROLL
-    FX = 2 * TILEX;
-    FY = 2 * TILEY;
-    BX1 = -2;
-    BY1 = -2;
-    BX2 = SCR_FIELDX + 1;
-    BY2 = SCR_FIELDY + 1;
-    redraw_x1 = 2;
-    redraw_y1 = 2;
-#else
-    FX = TILEX;
-    FY = TILEY;
-    BX1 = -1;
-    BY1 = -1;
-    BX2 = SCR_FIELDX;
-    BY2 = SCR_FIELDY;
-    redraw_x1 = 1;
-    redraw_y1 = 1;
-#endif
-#endif
 
     drawto_field = fieldbuffer;
   }
@@ -289,84 +252,42 @@ void SetDrawtoField(int mode)
     BY1 = 0;
     BX2 = SCR_FIELDX - 1;
     BY2 = SCR_FIELDY - 1;
-    redraw_x1 = 0;
-    redraw_y1 = 0;
 
     drawto_field = backbuffer;
   }
 }
 
-void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
+static void RedrawPlayfield_RND()
 {
-  if (game_status == GAME_MODE_PLAYING &&
-      level.game_engine_type == GAME_ENGINE_TYPE_EM)
-  {
-    /* currently there is no partial redraw -- always redraw whole playfield */
-    RedrawPlayfield_EM(TRUE);
-
-    /* blit playfield from scroll buffer to normal back buffer for fading in */
-    BlitScreenToBitmap_EM(backbuffer);
-  }
-  else if (game_status == GAME_MODE_PLAYING &&
-          level.game_engine_type == GAME_ENGINE_TYPE_SP)
-  {
-    /* currently there is no partial redraw -- always redraw whole playfield */
-    RedrawPlayfield_SP(TRUE);
-
-    /* blit playfield from scroll buffer to normal back buffer for fading in */
-    BlitScreenToBitmap_SP(backbuffer);
-  }
-  else if (game_status == GAME_MODE_PLAYING &&
-          !game.envelope_active)
-  {
-    if (force_redraw)
-    {
-      x = gfx.sx - TILEX;
-      y = gfx.sy - TILEY;
-      width = gfx.sxsize + 2 * TILEX;
-      height = gfx.sysize + 2 * TILEY;
-    }
-
-    if (force_redraw)
-    {
-      int xx, yy;
-      int x1 = (x - SX) / TILEX, y1 = (y - SY) / TILEY;
-      int x2 = (x - SX + width) / TILEX, y2 = (y - SY + height) / TILEY;
-
-      for (xx = BX1; xx <= BX2; xx++)
-       for (yy = BY1; yy <= BY2; yy++)
-         if (xx >= x1 && xx <= x2 && yy >= y1 && yy <= y2)
-           DrawScreenField(xx, yy);
-      DrawAllPlayers();
-    }
+  if (game.envelope_active)
+    return;
 
-    if (setup.soft_scrolling)
-    {
-      int fx = FX, fy = FY;
+  DrawLevel(REDRAW_ALL);
+  DrawAllPlayers();
+}
 
-      fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
-      fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
+void RedrawPlayfield()
+{
+  if (game_status != GAME_MODE_PLAYING)
+    return;
 
-      BlitBitmap(fieldbuffer, backbuffer, fx,fy, SXSIZE,SYSIZE, SX,SY);
-    }
-  }
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    RedrawPlayfield_EM(TRUE);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    RedrawPlayfield_SP(TRUE);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
+    RedrawPlayfield_RND();
 
-  if (force_redraw)
-  {
-    x = gfx.sx;
-    y = gfx.sy;
-    width = gfx.sxsize;
-    height = gfx.sysize;
-  }
+  BlitScreenToBitmap(backbuffer);
 
-  BlitBitmap(drawto, window, x, y, width, height, x, y);
+  BlitBitmap(drawto, window, gfx.sx, gfx.sy, gfx.sxsize, gfx.sysize,
+            gfx.sx, gfx.sy);
 }
 
 void DrawMaskedBorder_Rect(int x, int y, int width, int height)
 {
-  Bitmap *bitmap = graphic_info[IMG_GLOBAL_BORDER].bitmap;
+  Bitmap *bitmap = getGlobalBorderBitmapFromGameStatus();
 
-  SetClipOrigin(bitmap, bitmap->stored_clip_gc, 0, 0);
   BlitBitmapMasked(bitmap, backbuffer, x, y, width, height, x, y);
 }
 
@@ -409,13 +330,8 @@ void DrawMaskedBorder_ALL()
 void DrawMaskedBorder(int redraw_mask)
 {
   /* never draw masked screen borders on borderless screens */
-  if (effectiveGameStatus() == GAME_MODE_LOADING ||
-      effectiveGameStatus() == GAME_MODE_TITLE)
-    return;
-
-  /* never draw masked screen borders when displaying request outside door */
-  if (effectiveGameStatus() == GAME_MODE_PSEUDO_DOOR &&
-      global.use_envelope_request)
+  if (game_status == GAME_MODE_LOADING ||
+      game_status == GAME_MODE_TITLE)
     return;
 
   if (redraw_mask & REDRAW_ALL)
@@ -433,25 +349,18 @@ void DrawMaskedBorder(int redraw_mask)
   }
 }
 
-void BlitScreenToBitmap(Bitmap *target_bitmap)
+void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
 {
-  DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
   int fx = FX, fy = FY;
+  int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
+  int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
 
-#if NEW_TILESIZE
   int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
   int dy = (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
   int dx_var = dx * TILESIZE_VAR / TILESIZE;
   int dy_var = dy * TILESIZE_VAR / TILESIZE;
   int ffx, ffy;
 
-  // fx += dx * TILESIZE_VAR / TILESIZE;
-  // fy += dy * TILESIZE_VAR / TILESIZE;
-#else
-  fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
-  fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
-#endif
-
   ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
   ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
 
@@ -479,249 +388,80 @@ void BlitScreenToBitmap(Bitmap *target_bitmap)
     fy += dy_var;
   }
 
-#if 0
-  printf("::: (%d, %d) [(%d / %d, %d / %d)] => %d, %d\n",
-        scroll_x, scroll_y,
-        SBX_Left, SBX_Right,
-        SBY_Upper, SBY_Lower,
-        fx, fy);
-#endif
-
-  if (border.draw_masked[GAME_MODE_PLAYING])
+  if (full_lev_fieldx <= SCR_FIELDX)
   {
-    if (buffer != backbuffer)
-    {
-      /* copy playfield buffer to backbuffer to add masked border */
-      BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY);
-      DrawMaskedBorder(REDRAW_FIELD);
-    }
-
-    BlitBitmap(backbuffer, target_bitmap,
-              REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
-              REAL_SX, REAL_SY);
+    if (EVEN(SCR_FIELDX))
+      fx = 2 * TILEX_VAR - (ODD(lev_fieldx)  ? TILEX_VAR / 2 : 0);
+    else
+      fx = 2 * TILEX_VAR - (EVEN(lev_fieldx) ? TILEX_VAR / 2 : 0);
   }
-  else
+
+  if (full_lev_fieldy <= SCR_FIELDY)
   {
-    BlitBitmap(buffer, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
+    if (EVEN(SCR_FIELDY))
+      fy = 2 * TILEY_VAR - (ODD(lev_fieldy)  ? TILEY_VAR / 2 : 0);
+    else
+      fy = 2 * TILEY_VAR - (EVEN(lev_fieldy) ? TILEY_VAR / 2 : 0);
   }
+
+  BlitBitmap(drawto_field, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
 }
 
-void BackToFront()
+void BlitScreenToBitmap(Bitmap *target_bitmap)
 {
-  int x, y;
-  DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
-
-#if 0
-  printf("::: TILES TO REFRESH: %d\n", redraw_tiles);
-  for (x = 0; x < SCR_FIELDX; x++)
-    for (y = 0 ; y < SCR_FIELDY; y++)
-      if (redraw[redraw_x1 + x][redraw_y1 + y])
-       printf("::: - %d, %d [%s]\n",
-              LEVELX(x), LEVELY(y),
-              EL_NAME(Feld[LEVELX(x)][LEVELY(y)]));
-#endif
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    BlitScreenToBitmap_EM(target_bitmap);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    BlitScreenToBitmap_SP(target_bitmap);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
+    BlitScreenToBitmap_RND(target_bitmap);
 
-  if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
-    redraw_mask |= REDRAW_FIELD;
+  redraw_mask |= REDRAW_FIELD;
+}
 
-#if 0
-  // never redraw single tiles, always redraw the whole field
-  // (redrawing single tiles up to a certain threshold was faster on old,
-  // now legacy graphics, but slows things down on modern graphics now)
-  // UPDATE: this is now globally defined by value of REDRAWTILES_THRESHOLD
-  if (redraw_mask & REDRAW_TILES)
-    redraw_mask |= REDRAW_FIELD;
-#endif
+void DrawFramesPerSecond()
+{
+  char text[100];
+  int font_nr = FONT_TEXT_2;
+  int font_width = getFontWidth(font_nr);
 
-#if 0
-  /* !!! TEST ONLY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-  /* (force full redraw) */
-  if (game_status == GAME_MODE_PLAYING)
-    redraw_mask |= REDRAW_FIELD;
-#endif
+  sprintf(text, "%04.1f fps", global.frames_per_second);
 
-  if (redraw_mask & REDRAW_FIELD)
-    redraw_mask &= ~REDRAW_TILES;
+  DrawTextExt(backbuffer, WIN_XSIZE - font_width * strlen(text), 0, text,
+             font_nr, BLIT_OPAQUE);
+}
 
+void BackToFront()
+{
   if (redraw_mask == REDRAW_NONE)
     return;
 
-#if 0
-  printf("::: ");
-  if (redraw_mask & REDRAW_ALL)
-    printf("[REDRAW_ALL]");
-  if (redraw_mask & REDRAW_FIELD)
-    printf("[REDRAW_FIELD]");
-  if (redraw_mask & REDRAW_TILES)
-    printf("[REDRAW_TILES]");
-  if (redraw_mask & REDRAW_DOOR_1)
-    printf("[REDRAW_DOOR_1]");
-  if (redraw_mask & REDRAW_DOOR_2)
-    printf("[REDRAW_DOOR_2]");
-  if (redraw_mask & REDRAW_FROM_BACKBUFFER)
-    printf("[REDRAW_FROM_BACKBUFFER]");
-  printf(" [%d]\n", FrameCounter);
-#endif
-
-  if (redraw_mask & REDRAW_TILES &&
-      game_status == GAME_MODE_PLAYING &&
-      border.draw_masked[GAME_MODE_PLAYING])
-    redraw_mask |= REDRAW_FIELD;
-
-  if (global.fps_slowdown && game_status == GAME_MODE_PLAYING)
-  {
-    static boolean last_frame_skipped = FALSE;
-    boolean skip_even_when_not_scrolling = TRUE;
-    boolean just_scrolling = (ScreenMovDir != 0);
-    boolean verbose = FALSE;
-
-    if (global.fps_slowdown_factor > 1 &&
-       (FrameCounter % global.fps_slowdown_factor) &&
-       (just_scrolling || skip_even_when_not_scrolling))
-    {
-      redraw_mask &= ~REDRAW_MAIN;
-
-      last_frame_skipped = TRUE;
-
-      if (verbose)
-       printf("FRAME SKIPPED\n");
-    }
-    else
-    {
-      if (last_frame_skipped)
-       redraw_mask |= REDRAW_FIELD;
-
-      last_frame_skipped = FALSE;
-
-      if (verbose)
-       printf("frame not skipped\n");
-    }
-  }
+  // draw masked border to all viewports, if defined
+  DrawMaskedBorder(redraw_mask);
 
-  /* synchronize X11 graphics at this point; if we would synchronize the
-     display immediately after the buffer switching (after the XFlush),
-     this could mean that we have to wait for the graphics to complete,
-     although we could go on doing calculations for the next frame */
+  // draw frames per second (only if debug mode is enabled)
+  if (redraw_mask & REDRAW_FPS)
+    DrawFramesPerSecond();
 
-  SyncDisplay();
+  // redraw complete window if both playfield and (some) doors need redraw
+  if (redraw_mask & REDRAW_FIELD && redraw_mask & REDRAW_DOORS)
+    redraw_mask = REDRAW_ALL;
 
-  /* never draw masked border to backbuffer when using playfield buffer */
-  if (game_status != GAME_MODE_PLAYING ||
-      redraw_mask & REDRAW_FROM_BACKBUFFER ||
-      buffer == backbuffer)
-    DrawMaskedBorder(redraw_mask);
-  else
-    DrawMaskedBorder(redraw_mask & REDRAW_DOORS);
+  /* although redrawing the whole window would be fine for normal gameplay,
+     being able to only redraw the playfield is required for deactivating
+     certain drawing areas (mainly playfield) to work, which is needed for
+     warp-forward to be fast enough (by skipping redraw of most frames) */
 
   if (redraw_mask & REDRAW_ALL)
   {
     BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-
-    redraw_mask = REDRAW_NONE;
   }
-
-  if (redraw_mask & REDRAW_FIELD)
+  else if (redraw_mask & REDRAW_FIELD)
   {
-#if 0
-    printf("::: REDRAW_FIELD\n");
-#endif
-
-    if (game_status != GAME_MODE_PLAYING ||
-       redraw_mask & REDRAW_FROM_BACKBUFFER)
-    {
-      BlitBitmap(backbuffer, window,
-                REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
-    }
-    else
-    {
-#if 1
-      BlitScreenToBitmap(window);
-#else
-      int fx = FX, fy = FY;
-
-#if NEW_TILESIZE
-      int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
-      int dy = (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
-      int dx_var = dx * TILESIZE_VAR / TILESIZE;
-      int dy_var = dy * TILESIZE_VAR / TILESIZE;
-      int ffx, ffy;
-
-      // fx += dx * TILESIZE_VAR / TILESIZE;
-      // fy += dy * TILESIZE_VAR / TILESIZE;
-#else
-      fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
-      fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
-#endif
-
-      /* !!! THIS WORKS !!! */
-
-      printf("::: %d, %d\n", scroll_x, scroll_y);
-
-      ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
-      ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
-
-      if (EVEN(SCR_FIELDX))
-      {
-       if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
-         fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
-       else
-         fx += (dx > 0 ? TILEX_VAR : 0);
-      }
-      else
-      {
-       fx += dx;
-      }
-
-      if (EVEN(SCR_FIELDY))
-      {
-       if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR)
-         fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR;
-       else
-         fy += (dy > 0 ? TILEY_VAR : 0);
-      }
-      else
-      {
-       fy += dy;
-      }
-
-      if (border.draw_masked[GAME_MODE_PLAYING])
-      {
-       if (buffer != backbuffer)
-       {
-         /* copy playfield buffer to backbuffer to add masked border */
-         BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY);
-         DrawMaskedBorder(REDRAW_FIELD);
-       }
-
-       BlitBitmap(backbuffer, window,
-                  REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
-                  REAL_SX, REAL_SY);
-      }
-      else
-      {
-       BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY);
-      }
-#endif
-
-#if 0
-#ifdef DEBUG
-      printf("redrawing all (ScreenGfxPos == %d) because %s\n",
-            ScreenGfxPos,
-            (setup.soft_scrolling ?
-             "setup.soft_scrolling" :
-             ABS(ScreenGfxPos) + ScrollStepSize == TILEX ?
-             "ABS(ScreenGfxPos) + ScrollStepSize == TILEX" :
-             ABS(ScreenGfxPos) == ScrollStepSize ?
-             "ABS(ScreenGfxPos) == ScrollStepSize" :
-             "redraw_tiles > REDRAWTILES_THRESHOLD"));
-#endif
-#endif
-    }
-
-    redraw_mask &= ~REDRAW_MAIN;
+    BlitBitmap(backbuffer, window,
+              REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
   }
-
-  if (redraw_mask & REDRAW_DOORS)
+  else if (redraw_mask & REDRAW_DOORS)
   {
     if (redraw_mask & REDRAW_DOOR_1)
       BlitBitmap(backbuffer, window, DX, DY, DXSIZE, DYSIZE, DX, DY);
@@ -731,136 +471,8 @@ void BackToFront()
 
     if (redraw_mask & REDRAW_DOOR_3)
       BlitBitmap(backbuffer, window, EX, EY, EXSIZE, EYSIZE, EX, EY);
-
-    redraw_mask &= ~REDRAW_DOORS;
-  }
-
-  if (redraw_mask & REDRAW_MICROLEVEL)
-  {
-    BlitBitmap(backbuffer, window, SX, SY + 10 * TILEY, SXSIZE, 7 * TILEY,
-              SX, SY + 10 * TILEY);
-
-    redraw_mask &= ~REDRAW_MICROLEVEL;
-  }
-
-  if (redraw_mask & REDRAW_TILES)
-  {
-#if 0
-    printf("::: REDRAW_TILES\n");
-#endif
-
-#if NEW_TILESIZE
-
-#if 1
-    InitGfxClipRegion(TRUE, SX, SY, SXSIZE, SYSIZE);
-
-    {
-      int sx = SX; // - (EVEN(SCR_FIELDX) ? TILEX_VAR / 2 : 0);
-      int sy = SY; // + (EVEN(SCR_FIELDY) ? TILEY_VAR / 2 : 0);
-
-      int dx = 0, dy = 0;
-      int dx_var = dx * TILESIZE_VAR / TILESIZE;
-      int dy_var = dy * TILESIZE_VAR / TILESIZE;
-      int ffx, ffy;
-      int fx = FX, fy = FY;
-
-      int scr_fieldx = SCR_FIELDX + (EVEN(SCR_FIELDX) ? 2 : 0);
-      int scr_fieldy = SCR_FIELDY + (EVEN(SCR_FIELDY) ? 2 : 0);
-
-      ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
-      ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
-
-      if (EVEN(SCR_FIELDX))
-      {
-       if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
-       {
-         fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
-
-         if (fx % TILEX_VAR)
-           sx -= TILEX_VAR / 2;
-         else
-           sx -= TILEX_VAR;
-       }
-       else
-       {
-         fx += (dx_var > 0 ? TILEX_VAR : 0);
-       }
-      }
-
-      if (EVEN(SCR_FIELDY))
-      {
-       if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR)
-       {
-         fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR;
-
-         if (fy % TILEY_VAR)
-           sy -= TILEY_VAR / 2;
-         else
-           sy -= TILEY_VAR;
-       }
-       else
-       {
-         fy += (dy_var > 0 ? TILEY_VAR : 0);
-       }
-      }
-
-#if 0
-      printf("::: %d, %d, %d, %d\n", sx, sy, SCR_FIELDX, SCR_FIELDY);
-#endif
-
-      for (x = 0; x < scr_fieldx; x++)
-       for (y = 0 ; y < scr_fieldy; y++)
-         if (redraw[redraw_x1 + x][redraw_y1 + y])
-           BlitBitmap(buffer, window,
-                      FX + x * TILEX_VAR, FY + y * TILEY_VAR,
-                      TILEX_VAR, TILEY_VAR,
-                      sx + x * TILEX_VAR, sy + y * TILEY_VAR);
-    }
-
-    InitGfxClipRegion(FALSE, -1, -1, -1, -1);
-#else
-    for (x = 0; x < SCR_FIELDX; x++)
-      for (y = 0 ; y < SCR_FIELDY; y++)
-       if (redraw[redraw_x1 + x][redraw_y1 + y])
-         BlitBitmap(buffer, window,
-                    FX + x * TILEX_VAR, FY + y * TILEY_VAR,
-                    TILEX_VAR, TILEY_VAR,
-                    SX + x * TILEX_VAR, SY + y * TILEY_VAR);
-#endif
-
-#else
-    for (x = 0; x < SCR_FIELDX; x++)
-      for (y = 0 ; y < SCR_FIELDY; y++)
-       if (redraw[redraw_x1 + x][redraw_y1 + y])
-         BlitBitmap(buffer, window,
-                    FX + x * TILEX, FY + y * TILEY, TILEX, TILEY,
-                    SX + x * TILEX, SY + y * TILEY);
-#endif
-  }
-
-  if (redraw_mask & REDRAW_FPS)                /* display frames per second */
-  {
-    char text[100];
-    char info1[100];
-
-    sprintf(info1, " (only every %d. frame)", global.fps_slowdown_factor);
-    if (!global.fps_slowdown)
-      info1[0] = '\0';
-
-    sprintf(text, "%04.1f fps%s", global.frames_per_second, info1);
-#if 1
-    DrawTextExt(window, SX + SXSIZE + SX, 0, text, FONT_TEXT_2, BLIT_OPAQUE);
-#else
-    DrawTextExt(window, SX, SY, text, FONT_TEXT_2, BLIT_OPAQUE);
-#endif
   }
 
-  FlushDisplay();
-
-  for (x = 0; x < MAX_BUF_XSIZE; x++)
-    for (y = 0; y < MAX_BUF_YSIZE; y++)
-      redraw[x][y] = 0;
-  redraw_tiles = 0;
   redraw_mask = REDRAW_NONE;
 }
 
@@ -869,6 +481,16 @@ static void FadeCrossSaveBackbuffer()
   BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 }
 
+static void FadeCrossRestoreBackbuffer()
+{
+  int redraw_mask_last = redraw_mask;
+
+  BlitBitmap(bitmap_db_cross, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+
+  // do not change redraw mask when restoring backbuffer after cross-fading
+  redraw_mask = redraw_mask_last;
+}
+
 static void FadeExt(int fade_mask, int fade_mode, int fade_type)
 {
   static int fade_type_skip = FADE_TYPE_NONE;
@@ -881,10 +503,6 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
   {
     if (fade_type_skip != FADE_TYPE_NONE)
     {
-#if 0
-      printf("::: skipping %d ... [%d] (X)\n", fade_mode, fade_type_skip);
-#endif
-
       /* skip all fade operations until specified fade operation */
       if (fade_type & fade_type_skip)
        fade_type_skip = FADE_TYPE_NONE;
@@ -892,9 +510,15 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
       return;
     }
 
+#if 1
+    FadeCrossSaveBackbuffer();
+#endif
+
     if (fading.fade_mode & FADE_TYPE_TRANSFORM)
     {
+#if 0
       FadeCrossSaveBackbuffer();
+#endif
 
       return;
     }
@@ -904,83 +528,34 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
 
   if (fade_type == FADE_TYPE_SKIP)
   {
-#if 0
-    printf("::: will skip %d ... [%d]\n", fade_mode, fade_type_skip);
-#endif
-
     fade_type_skip = fade_mode;
 
     return;
   }
 
-#if 0
-  printf("::: !!! FADING %d ... [%d] [%d]\n", fade_mode, fade_type,
-        fade_type_skip);
-#endif
-
-#if 1
   fade_delay = fading.fade_delay;
   post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
-#endif
 
   if (fade_type_skip != FADE_TYPE_NONE)
   {
-#if 0
-    printf("::: skipping %d ... [%d]\n", fade_mode, fade_type_skip);
-#endif
-
     /* skip all fade operations until specified fade operation */
     if (fade_type & fade_type_skip)
       fade_type_skip = FADE_TYPE_NONE;
 
-#if 1
     fade_delay = 0;
-#else
-    return;
-#endif
   }
 
-#if 1
   if (global.autoplay_leveldir)
   {
-    // fading.fade_mode = FADE_MODE_NONE;
-
-    return;
-  }
-#endif
-
-#if 0
-  if (fading.fade_mode == FADE_MODE_NONE)
-  {
-    BackToFront();
-
     return;
   }
-#endif
-
-  /* !!! what about fade_mask == REDRAW_FIELD | REDRAW_ALL ??? !!! */
-
-#if 0
-  printf("::: NOW FADING %d ... [%d]\n", fade_mode, fade_type);
-#endif
-
-#if 0
-  if (fade_mask == REDRAW_NONE)
-    fade_mask = REDRAW_FIELD;
-#endif
 
-  // if (fade_mask & REDRAW_FIELD)
   if (fade_mask == REDRAW_FIELD)
   {
-    x = REAL_SX;
-    y = REAL_SY;
-    width  = FULL_SXSIZE;
-    height = FULL_SYSIZE;
-
-#if 0
-    fade_delay = fading.fade_delay;
-    post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
-#endif
+    x = FADE_SX;
+    y = FADE_SY;
+    width  = FADE_SXSIZE;
+    height = FADE_SYSIZE;
 
     if (border.draw_masked_when_fading)
       draw_border_function = DrawMaskedBorder_FIELD;   /* update when fading */
@@ -993,36 +568,18 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     y = 0;
     width  = WIN_XSIZE;
     height = WIN_YSIZE;
+  }
 
-#if 0
-    fade_delay = fading.fade_delay;
-    post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0);
-#endif
-  }
-
-#if 1
   if (!setup.fade_screens ||
       fade_delay == 0 ||
       fading.fade_mode == FADE_MODE_NONE)
-#else
-  if (!setup.fade_screens || fade_delay == 0)
-#endif
   {
     if (fade_mode == FADE_MODE_FADE_OUT)
       return;
 
-#if 0
-    if (fade_mode == FADE_MODE_FADE_OUT &&
-       fading.fade_mode != FADE_MODE_NONE)
-      ClearRectangle(backbuffer, x, y, width, height);
-#endif
-
-#if 1
     BlitBitmap(backbuffer, window, x, y, width, height, x, y);
-    redraw_mask = REDRAW_NONE;
-#else
-    BackToFront();
-#endif
+
+    redraw_mask &= ~fade_mask;
 
     return;
   }
@@ -1030,6 +587,9 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
   FadeRectangle(bitmap, x, y, width, height, fade_mode, fade_delay, post_delay,
                draw_border_function);
 
+  if (fade_type == FADE_TYPE_FADE_OUT)
+    FadeCrossRestoreBackbuffer();
+
   redraw_mask &= ~fade_mask;
 }
 
@@ -1039,6 +599,11 @@ void FadeIn(int fade_mask)
     FadeExt(fade_mask, fading.fade_mode, FADE_TYPE_FADE_IN);
   else
     FadeExt(fade_mask, FADE_MODE_FADE_IN, FADE_TYPE_FADE_IN);
+
+  FADE_SX = REAL_SX;
+  FADE_SY = REAL_SY;
+  FADE_SXSIZE = FULL_SXSIZE;
+  FADE_SYSIZE = FULL_SYSIZE;
 }
 
 void FadeOut(int fade_mask)
@@ -1065,10 +630,6 @@ void FadeSetEnterMenu()
 {
   fading = menu.enter_menu;
 
-#if 0
-  printf("::: storing enter_menu\n");
-#endif
-
   FadeSetLeaveNext(fading, TRUE);      /* (keep same fade mode) */
 }
 
@@ -1076,10 +637,6 @@ void FadeSetLeaveMenu()
 {
   fading = menu.leave_menu;
 
-#if 0
-  printf("::: storing leave_menu\n");
-#endif
-
   FadeSetLeaveNext(fading, TRUE);      /* (keep same fade mode) */
 }
 
@@ -1087,10 +644,6 @@ void FadeSetEnterScreen()
 {
   fading = menu.enter_screen[game_status];
 
-#if 0
-  printf("::: storing leave_screen[%d]\n", game_status);
-#endif
-
   FadeSetLeaveNext(menu.leave_screen[game_status], TRUE);      /* store */
 }
 
@@ -1098,20 +651,12 @@ void FadeSetNextScreen()
 {
   fading = menu.next_screen;
 
-#if 0
-  printf("::: storing next_screen\n");
-#endif
-
   // (do not overwrite fade mode set by FadeSetEnterScreen)
   // FadeSetLeaveNext(fading, TRUE);   /* (keep same fade mode) */
 }
 
 void FadeSetLeaveScreen()
 {
-#if 0
-  printf("::: recalling last stored value\n");
-#endif
-
   FadeSetLeaveNext(menu.leave_screen[game_status], FALSE);     /* recall */
 }
 
@@ -1142,6 +687,39 @@ void FadeSkipNextFadeOut()
   FadeExt(0, FADE_MODE_SKIP_FADE_OUT, FADE_TYPE_SKIP);
 }
 
+Bitmap *getBitmapFromGraphicOrDefault(int graphic, int default_graphic)
+{
+  boolean redefined = getImageListEntryFromImageID(graphic)->redefined;
+
+  return (graphic == IMG_UNDEFINED ? NULL :
+         graphic_info[graphic].bitmap != NULL || redefined ?
+         graphic_info[graphic].bitmap :
+         graphic_info[default_graphic].bitmap);
+}
+
+Bitmap *getBackgroundBitmap(int graphic)
+{
+  return getBitmapFromGraphicOrDefault(graphic, IMG_BACKGROUND);
+}
+
+Bitmap *getGlobalBorderBitmap(int graphic)
+{
+  return getBitmapFromGraphicOrDefault(graphic, IMG_GLOBAL_BORDER);
+}
+
+Bitmap *getGlobalBorderBitmapFromGameStatus()
+{
+  int graphic =
+    (game_status == GAME_MODE_MAIN ||
+     game_status == GAME_MODE_PSEUDO_TYPENAME  ? IMG_GLOBAL_BORDER_MAIN :
+     game_status == GAME_MODE_SCORES           ? IMG_GLOBAL_BORDER_SCORES :
+     game_status == GAME_MODE_EDITOR           ? IMG_GLOBAL_BORDER_EDITOR :
+     game_status == GAME_MODE_PLAYING          ? IMG_GLOBAL_BORDER_PLAYING :
+     IMG_GLOBAL_BORDER);
+
+  return getGlobalBorderBitmap(graphic);
+}
+
 void SetWindowBackgroundImageIfDefined(int graphic)
 {
   if (graphic_info[graphic].bitmap)
@@ -1162,63 +740,34 @@ void SetDoorBackgroundImageIfDefined(int graphic)
 
 void SetWindowBackgroundImage(int graphic)
 {
-  SetWindowBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
-                           graphic_info[graphic].bitmap ?
-                           graphic_info[graphic].bitmap :
-                           graphic_info[IMG_BACKGROUND].bitmap);
+  SetWindowBackgroundBitmap(getBackgroundBitmap(graphic));
 }
 
 void SetMainBackgroundImage(int graphic)
 {
-  SetMainBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
-                         graphic_info[graphic].bitmap ?
-                         graphic_info[graphic].bitmap :
-                         graphic_info[IMG_BACKGROUND].bitmap);
+  SetMainBackgroundBitmap(getBackgroundBitmap(graphic));
 }
 
 void SetDoorBackgroundImage(int graphic)
 {
-  SetDoorBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
-                         graphic_info[graphic].bitmap ?
-                         graphic_info[graphic].bitmap :
-                         graphic_info[IMG_BACKGROUND].bitmap);
+  SetDoorBackgroundBitmap(getBackgroundBitmap(graphic));
 }
 
 void SetPanelBackground()
 {
-#if 1
   struct GraphicInfo *gfx = &graphic_info[IMG_BACKGROUND_PANEL];
 
-#if 1
   BlitBitmapTiled(gfx->bitmap, bitmap_db_panel, gfx->src_x, gfx->src_y,
                  gfx->width, gfx->height, 0, 0, DXSIZE, DYSIZE);
-#else
-  /* (ClearRectangle() only needed if panel bitmap is smaller than panel) */
-  ClearRectangle(bitmap_db_panel, DX, DY, DXSIZE, DYSIZE);
-  BlitBitmap(gfx->bitmap, bitmap_db_panel, gfx->src_x, gfx->src_y,
-            MIN(gfx->width, DXSIZE), MIN(gfx->height, DYSIZE), 0, 0);
-#endif
-#else
-  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, bitmap_db_panel,
-             DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, 0, 0);
-#endif
 
   SetDoorBackgroundBitmap(bitmap_db_panel);
 }
 
 void DrawBackground(int x, int y, int width, int height)
 {
-  /* !!! "drawto" might still point to playfield buffer here (see below) !!! */
-  /* (when entering hall of fame after playing) */
-#if 0
-  ClearRectangleOnBackground(drawto, x, y, width, height);
-#else
+  /* "drawto" might still point to playfield buffer here (hall of fame) */
   ClearRectangleOnBackground(backbuffer, x, y, width, height);
-#endif
-
-#if 1
 
-#if 1
   if (IN_GFX_FIELD_FULL(x, y))
     redraw_mask |= REDRAW_FIELD;
   else if (IN_GFX_DOOR_1(x, y))
@@ -1227,20 +776,6 @@ void DrawBackground(int x, int y, int width, int height)
     redraw_mask |= REDRAW_DOOR_2;
   else if (IN_GFX_DOOR_3(x, y))
     redraw_mask |= REDRAW_DOOR_3;
-#else
-  /* (this only works for the current arrangement of playfield and panels) */
-  if (x < gfx.dx)
-    redraw_mask |= REDRAW_FIELD;
-  else if (y < gfx.vy)
-    redraw_mask |= REDRAW_DOOR_1;
-  else
-    redraw_mask |= REDRAW_DOOR_2;
-#endif
-
-#else
-  /* (this is just wrong (when drawing to one of the two door panel areas)) */
-  redraw_mask |= REDRAW_FIELD;
-#endif
 }
 
 void DrawBackgroundForFont(int x, int y, int width, int height, int font_nr)
@@ -1263,32 +798,156 @@ void DrawBackgroundForGraphic(int x, int y, int width, int height, int graphic)
   DrawBackground(x, y, width, height);
 }
 
+static int game_status_last = -1;
+static Bitmap *global_border_bitmap_last = NULL;
+static Bitmap *global_border_bitmap = NULL;
+static int real_sx_last = -1, real_sy_last = -1;
+static int full_sxsize_last = -1, full_sysize_last = -1;
+static int dx_last = -1, dy_last = -1;
+static int dxsize_last = -1, dysize_last = -1;
+static int vx_last = -1, vy_last = -1;
+static int vxsize_last = -1, vysize_last = -1;
+
+boolean CheckIfGlobalBorderHasChanged()
+{
+  // if game status has not changed, global border has not changed either
+  if (game_status == game_status_last)
+    return FALSE;
+
+  // determine and store new global border bitmap for current game status
+  global_border_bitmap = getGlobalBorderBitmapFromGameStatus();
+
+  return (global_border_bitmap_last != global_border_bitmap);
+}
+
+boolean CheckIfGlobalBorderRedrawIsNeeded()
+{
+  // if game status has not changed, nothing has to be redrawn
+  if (game_status == game_status_last)
+    return FALSE;
+
+  // redraw if last screen was title screen
+  if (game_status_last == GAME_MODE_TITLE)
+    return TRUE;
+
+  // redraw if global screen border has changed
+  if (CheckIfGlobalBorderHasChanged())
+    return TRUE;
+
+  // redraw if position or size of playfield area has changed
+  if (real_sx_last != REAL_SX || real_sy_last != REAL_SY ||
+      full_sxsize_last != FULL_SXSIZE || full_sysize_last != FULL_SYSIZE)
+    return TRUE;
+
+  // redraw if position or size of door area has changed
+  if (dx_last != DX || dy_last != DY ||
+      dxsize_last != DXSIZE || dysize_last != DYSIZE)
+    return TRUE;
+
+  // redraw if position or size of tape area has changed
+  if (vx_last != VX || vy_last != VY ||
+      vxsize_last != VXSIZE || vysize_last != VYSIZE)
+    return TRUE;
+
+  return FALSE;
+}
+
+void RedrawGlobalBorderFromBitmap(Bitmap *bitmap)
+{
+  if (bitmap)
+    BlitBitmap(bitmap, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  else
+    ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
+}
+
+void RedrawGlobalBorder()
+{
+  Bitmap *bitmap = getGlobalBorderBitmapFromGameStatus();
+
+  RedrawGlobalBorderFromBitmap(bitmap);
+
+  redraw_mask = REDRAW_ALL;
+}
+
+static void RedrawGlobalBorderIfNeeded()
+{
+  if (game_status == game_status_last)
+    return;
+
+  // copy current draw buffer to later copy back areas that have not changed
+  BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+
+  if (CheckIfGlobalBorderRedrawIsNeeded())
+  {
+    // redraw global screen border (or clear, if defined to be empty)
+    RedrawGlobalBorderFromBitmap(global_border_bitmap);
+
+    // copy previous playfield and door areas, if they are defined on both
+    // previous and current screen and if they still have the same size
+
+    if (real_sx_last != -1 && real_sy_last != -1 &&
+       REAL_SX != -1 && REAL_SY != -1 &&
+       full_sxsize_last == FULL_SXSIZE && full_sysize_last == FULL_SYSIZE)
+      BlitBitmap(bitmap_db_store, backbuffer,
+                real_sx_last, real_sy_last, FULL_SXSIZE, FULL_SYSIZE,
+                REAL_SX, REAL_SY);
+
+    if (dx_last != -1 && dy_last != -1 &&
+       DX != -1 && DY != -1 &&
+       dxsize_last == DXSIZE && dysize_last == DYSIZE)
+      BlitBitmap(bitmap_db_store, backbuffer,
+                dx_last, dy_last, DXSIZE, DYSIZE, DX, DY);
+
+    if (vx_last != -1 && vy_last != -1 &&
+       VX != -1 && VY != -1 &&
+       vxsize_last == VXSIZE && vysize_last == VYSIZE)
+      BlitBitmap(bitmap_db_store, backbuffer,
+                vx_last, vy_last, VXSIZE, VYSIZE, VX, VY);
+
+    redraw_mask = REDRAW_ALL;
+  }
+
+  game_status_last = game_status;
+
+  global_border_bitmap_last = global_border_bitmap;
+
+  real_sx_last = REAL_SX;
+  real_sy_last = REAL_SY;
+  full_sxsize_last = FULL_SXSIZE;
+  full_sysize_last = FULL_SYSIZE;
+  dx_last = DX;
+  dy_last = DY;
+  dxsize_last = DXSIZE;
+  dysize_last = DYSIZE;
+  vx_last = VX;
+  vy_last = VY;
+  vxsize_last = VXSIZE;
+  vysize_last = VYSIZE;
+}
+
 void ClearField()
 {
+  RedrawGlobalBorderIfNeeded();
+
   /* !!! "drawto" might still point to playfield buffer here (see above) !!! */
   /* (when entering hall of fame after playing) */
   DrawBackground(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
 
   /* !!! maybe this should be done before clearing the background !!! */
-  if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING)
+  if (game_status == GAME_MODE_PLAYING)
   {
     ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
-    SetDrawtoField(DRAW_BUFFERED);
+    SetDrawtoField(DRAW_FIELDBUFFER);
   }
   else
+  {
     SetDrawtoField(DRAW_BACKBUFFER);
+  }
 }
 
 void MarkTileDirty(int x, int y)
 {
-  int xx = redraw_x1 + x;
-  int yy = redraw_y1 + y;
-
-  if (!redraw[xx][yy])
-    redraw_tiles++;
-
-  redraw[xx][yy] = TRUE;
-  redraw_mask |= REDRAW_TILES;
+  redraw_mask |= REDRAW_FIELD;
 }
 
 void SetBorderElement()
@@ -1348,7 +1007,7 @@ void SetRandomAnimationValue(int x, int y)
   gfx.anim_random_frame = GfxRandom[x][y];
 }
 
-inline int getGraphicAnimationFrame(int graphic, int sync_frame)
+int getGraphicAnimationFrame(int graphic, int sync_frame)
 {
   /* animation synchronized with global frame counter, not move position */
   if (graphic_info[graphic].anim_global_sync || sync_frame < 0)
@@ -1361,73 +1020,52 @@ inline int getGraphicAnimationFrame(int graphic, int sync_frame)
                           sync_frame);
 }
 
-void getSizedGraphicSourceExt(int graphic, int frame, int tilesize_raw,
+void getSizedGraphicSourceExt(int graphic, int frame, int tilesize,
                              Bitmap **bitmap, int *x, int *y,
                              boolean get_backside)
 {
-  struct
-  {
-    int width_mult, width_div;
-    int height_mult, height_div;
-  }
-  offset_calc[6] =
-  {
-    { 15, 16,  2, 3    },      /* 1 x 1 */
-    { 7, 8,    2, 3    },      /* 2 x 2 */
-    { 3, 4,    2, 3    },      /* 4 x 4 */
-    { 1, 2,    2, 3    },      /* 8 x 8 */
-    { 0, 1,    2, 3    },      /* 16 x 16 */
-    { 0, 1,    0, 1    },      /* 32 x 32 */
-  };
   struct GraphicInfo *g = &graphic_info[graphic];
   Bitmap *src_bitmap = g->bitmap;
-  int tilesize = MIN(MAX(1, tilesize_raw), TILESIZE);
-  int offset_calc_pos = log_2(tilesize);
-  int width_mult  = offset_calc[offset_calc_pos].width_mult;
-  int width_div   = offset_calc[offset_calc_pos].width_div;
-  int height_mult = offset_calc[offset_calc_pos].height_mult;
-  int height_div  = offset_calc[offset_calc_pos].height_div;
-  int startx = src_bitmap->width * width_mult / width_div;
-  int starty = src_bitmap->height * height_mult / height_div;
-#if NEW_TILESIZE
-  int src_x = (g->src_x + (get_backside ? g->offset2_x : 0)) *
-    tilesize / TILESIZE;
-  int src_y = (g->src_y + (get_backside ? g->offset2_y : 0)) *
-    tilesize / TILESIZE;
-#else
-  int src_x = g->src_x * tilesize / TILESIZE;
-  int src_y = g->src_y * tilesize / TILESIZE;
-#endif
-  int width = g->width * tilesize / TILESIZE;
-  int height = g->height * tilesize / TILESIZE;
-  int offset_x = g->offset_x * tilesize / TILESIZE;
-  int offset_y = g->offset_y * tilesize / TILESIZE;
+  int src_x = g->src_x + (get_backside ? g->offset2_x : 0);
+  int src_y = g->src_y + (get_backside ? g->offset2_y : 0);
+  int tilesize_capped = MIN(MAX(1, tilesize), TILESIZE);
+
+  // if no in-game graphics defined, always use standard graphic size
+  if (g->bitmaps[IMG_BITMAP_GAME] == NULL)
+    tilesize = TILESIZE;
+
+  if (tilesize == gfx.standard_tile_size)
+    src_bitmap = g->bitmaps[IMG_BITMAP_STANDARD];
+  else if (tilesize == game.tile_size)
+    src_bitmap = g->bitmaps[IMG_BITMAP_GAME];
+  else
+    src_bitmap = g->bitmaps[IMG_BITMAP_1x1 - log_2(tilesize_capped)];
 
   if (g->offset_y == 0)                /* frames are ordered horizontally */
   {
-    int max_width = g->anim_frames_per_line * width;
-    int pos = (src_y / height) * max_width + src_x + frame * offset_x;
+    int max_width = g->anim_frames_per_line * g->width;
+    int pos = (src_y / g->height) * max_width + src_x + frame * g->offset_x;
 
     src_x = pos % max_width;
-    src_y = src_y % height + pos / max_width * height;
+    src_y = src_y % g->height + pos / max_width * g->height;
   }
   else if (g->offset_x == 0)   /* frames are ordered vertically */
   {
-    int max_height = g->anim_frames_per_line * height;
-    int pos = (src_x / width) * max_height + src_y + frame * offset_y;
+    int max_height = g->anim_frames_per_line * g->height;
+    int pos = (src_x / g->width) * max_height + src_y + frame * g->offset_y;
 
-    src_x = src_x % width + pos / max_height * width;
+    src_x = src_x % g->width + pos / max_height * g->width;
     src_y = pos % max_height;
   }
   else                         /* frames are ordered diagonally */
   {
-    src_x = src_x + frame * offset_x;
-    src_y = src_y + frame * offset_y;
+    src_x = src_x + frame * g->offset_x;
+    src_y = src_y + frame * g->offset_y;
   }
 
   *bitmap = src_bitmap;
-  *x = startx + src_x;
-  *y = starty + src_y;
+  *x = src_x * tilesize / TILESIZE;
+  *y = src_y * tilesize / TILESIZE;
 }
 
 void getFixedGraphicSourceExt(int graphic, int frame, Bitmap **bitmap,
@@ -1437,10 +1075,10 @@ void getFixedGraphicSourceExt(int graphic, int frame, Bitmap **bitmap,
                           get_backside);
 }
 
-void getSizedGraphicSource(int graphic, int frame, int tilesize_raw,
+void getSizedGraphicSource(int graphic, int frame, int tilesize,
                           Bitmap **bitmap, int *x, int *y)
 {
-  getSizedGraphicSourceExt(graphic, frame, tilesize_raw, bitmap, x, y, FALSE);
+  getSizedGraphicSourceExt(graphic, frame, tilesize, bitmap, x, y, FALSE);
 }
 
 void getFixedGraphicSource(int graphic, int frame,
@@ -1451,31 +1089,19 @@ void getFixedGraphicSource(int graphic, int frame,
 
 void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
-#if 1
   getSizedGraphicSource(graphic, 0, MINI_TILESIZE, bitmap, x, y);
-#else
-  struct GraphicInfo *g = &graphic_info[graphic];
-  int mini_startx = 0;
-  int mini_starty = g->bitmap->height * 2 / 3;
-
-  *bitmap = g->bitmap;
-  *x = mini_startx + g->src_x / 2;
-  *y = mini_starty + g->src_y / 2;
-#endif
 }
 
-inline void getGraphicSourceExt(int graphic, int frame, Bitmap **bitmap,
-                               int *x, int *y, boolean get_backside)
+inline static void getGraphicSourceExt(int graphic, int frame, Bitmap **bitmap,
+                                      int *x, int *y, boolean get_backside)
 {
   struct GraphicInfo *g = &graphic_info[graphic];
   int src_x = g->src_x + (get_backside ? g->offset2_x : 0);
   int src_y = g->src_y + (get_backside ? g->offset2_y : 0);
 
-#if NEW_TILESIZE
   if (TILESIZE_VAR != TILESIZE)
     return getSizedGraphicSourceExt(graphic, frame, TILESIZE_VAR, bitmap, x, y,
                                    get_backside);
-#endif
 
   *bitmap = g->bitmap;
 
@@ -1518,12 +1144,9 @@ void DrawGraphic(int x, int y, int graphic, int frame)
   }
 #endif
 
-#if NEW_TILESIZE
   DrawGraphicExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, graphic,
                 frame);
-#else
-  DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame);
-#endif
+
   MarkTileDirty(x, y);
 }
 
@@ -1550,11 +1173,8 @@ void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
   int src_x, src_y;
 
   getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
-#if NEW_TILESIZE
+
   BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX_VAR, TILEY_VAR, x, y);
-#else
-  BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
-#endif
 }
 
 void DrawFixedGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
@@ -1578,13 +1198,9 @@ void DrawGraphicThruMask(int x, int y, int graphic, int frame)
   }
 #endif
 
-#if NEW_TILESIZE
   DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR,
                         graphic, frame);
-#else
-  DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic,
-                        frame);
-#endif
+
   MarkTileDirty(x, y);
 }
 
@@ -1612,27 +1228,21 @@ void DrawGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, int graphic,
 
   getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
 
-  SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-               dst_x - src_x, dst_y - src_y);
-#if NEW_TILESIZE
   BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX_VAR, TILEY_VAR,
                   dst_x, dst_y);
-#else
-  BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dst_x, dst_y);
-#endif
 }
 
 void DrawFixedGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y,
                                 int graphic, int frame)
 {
+  struct GraphicInfo *g = &graphic_info[graphic];
   Bitmap *src_bitmap;
   int src_x, src_y;
 
   getFixedGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
 
-  SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-               dst_x - src_x, dst_y - src_y);
-  BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dst_x, dst_y);
+  BlitBitmapMasked(src_bitmap, d, src_x, src_y, g->width, g->height,
+                  dst_x, dst_y);
 }
 
 void DrawSizedGraphic(int x, int y, int graphic, int frame, int tilesize)
@@ -1750,14 +1360,12 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy,
   }
 #endif
 
-#if NEW_TILESIZE
   width = width * TILESIZE_VAR / TILESIZE;
   height = height * TILESIZE_VAR / TILESIZE;
   cx = cx * TILESIZE_VAR / TILESIZE;
   cy = cy * TILESIZE_VAR / TILESIZE;
   dx = dx * TILESIZE_VAR / TILESIZE;
   dy = dy * TILESIZE_VAR / TILESIZE;
-#endif
 
   if (width > 0 && height > 0)
   {
@@ -1766,21 +1374,12 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy,
     src_x += cx;
     src_y += cy;
 
-#if NEW_TILESIZE
     dst_x = FX + x * TILEX_VAR + dx;
     dst_y = FY + y * TILEY_VAR + dy;
-#else
-    dst_x = FX + x * TILEX + dx;
-    dst_y = FY + y * TILEY + dy;
-#endif
 
     if (mask_mode == USE_MASKING)
-    {
-      SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-                   dst_x - src_x, dst_y - src_y);
       BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height,
                       dst_x, dst_y);
-    }
     else
       BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
                 dst_x, dst_y);
@@ -1796,72 +1395,38 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy,
   Bitmap *src_bitmap;
   int src_x, src_y;
   int dst_x, dst_y;
-#if NEW_TILESIZE
   int width = TILEX_VAR, height = TILEY_VAR;
-#else
-  int width = TILEX, height = TILEY;
-#endif
   int x1 = x;
   int y1 = y;
   int x2 = x + SIGN(dx);
   int y2 = y + SIGN(dy);
-#if 0
-  /* !!! DOES NOT WORK FOR SLOW MOVEMENT !!! */
-  int sync_frame = GfxFrame[LEVELX(x)][LEVELY(y)];
-#else
+
   /* movement with two-tile animations must be sync'ed with movement position,
      not with current GfxFrame (which can be higher when using slow movement) */
   int anim_pos = (dx ? ABS(dx) : ABS(dy));
   int anim_frames = graphic_info[graphic].anim_frames;
-#if 1
+
   /* (we also need anim_delay here for movement animations with less frames) */
   int anim_delay = graphic_info[graphic].anim_delay;
   int sync_frame = anim_pos * anim_frames * anim_delay / TILESIZE;
-#else
-  int sync_frame = anim_pos * anim_frames / TILESIZE;
-#endif
-#endif
+
   boolean draw_start_tile = (cut_mode != CUT_ABOVE);   /* only for falling! */
   boolean draw_end_tile   = (cut_mode != CUT_BELOW);   /* only for falling! */
 
   /* re-calculate animation frame for two-tile movement animation */
   frame = getGraphicAnimationFrame(graphic, sync_frame);
 
-#if 0
-#if 0
-  printf("::: %d, %d, %d => %d [%d]\n",
-        anim_pos, anim_frames, anim_delay, sync_frame, graphic);
-#else
-  printf("::: %d, %d => %d\n",
-        anim_pos, anim_frames, sync_frame);
-#endif
-#endif
-
-#if 0
-  printf("::: %d [%d, %d] [%d] [%d]\n", frame, sync_frame, dy,
-        GfxFrame[LEVELX(x)][LEVELY(y)], mask_mode);
-#endif
-
   /* check if movement start graphic inside screen area and should be drawn */
   if (draw_start_tile && IN_SCR_FIELD(x1, y1))
   {
     getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, TRUE);
 
-#if NEW_TILESIZE
     dst_x = FX + x1 * TILEX_VAR;
     dst_y = FY + y1 * TILEY_VAR;
-#else
-    dst_x = FX + x1 * TILEX;
-    dst_y = FY + y1 * TILEY;
-#endif
 
     if (mask_mode == USE_MASKING)
-    {
-      SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-                   dst_x - src_x, dst_y - src_y);
       BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height,
                       dst_x, dst_y);
-    }
     else
       BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
                 dst_x, dst_y);
@@ -1874,21 +1439,12 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy,
   {
     getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE);
 
-#if NEW_TILESIZE
     dst_x = FX + x2 * TILEX_VAR;
     dst_y = FY + y2 * TILEY_VAR;
-#else
-    dst_x = FX + x2 * TILEX;
-    dst_y = FY + y2 * TILEY;
-#endif
 
     if (mask_mode == USE_MASKING)
-    {
-      SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-                   dst_x - src_x, dst_y - src_y);
       BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height,
                       dst_x, dst_y);
-    }
     else
       BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
                 dst_x, dst_y);
@@ -2050,23 +1606,13 @@ static void DrawLevelFieldCrumbledInnerCorners(int x, int y, int dx, int dy,
 
   getGraphicSource(graphic, 1, &src_bitmap, &src_x, &src_y);
 
-#if NEW_TILESIZE
   width  = crumbled_border_size * TILESIZE_VAR / TILESIZE;
   height = crumbled_border_size * TILESIZE_VAR / TILESIZE;
-  cx = (dx > 0 ? TILEX - crumbled_border_size : 0) * TILESIZE_VAR / TILESIZE;
-  cy = (dy > 0 ? TILEY - crumbled_border_size : 0) * TILESIZE_VAR / TILESIZE;
+  cx = (dx > 0 ? TILESIZE_VAR - width  : 0);
+  cy = (dy > 0 ? TILESIZE_VAR - height : 0);
 
   BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy,
             width, height, FX + sx * TILEX_VAR + cx, FY + sy * TILEY_VAR + cy);
-#else
-  width  = crumbled_border_size;
-  height = crumbled_border_size;
-  cx = (dx > 0 ? TILEX - crumbled_border_size : 0);
-  cy = (dy > 0 ? TILEY - crumbled_border_size : 0);
-
-  BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy,
-            width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy);
-#endif
 }
 
 static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame,
@@ -2077,46 +1623,22 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame,
   int width, height, bx, by, cx, cy;
   int sx = SCREENX(x), sy = SCREENY(y);
   int crumbled_border_size = graphic_info[graphic].border_size;
+  int crumbled_border_size_var = crumbled_border_size * TILESIZE_VAR / TILESIZE;
+  int crumbled_border_pos_var = TILESIZE_VAR - crumbled_border_size_var;
   int i;
 
   getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
 
   /* draw simple, sloppy, non-corner-accurate crumbled border */
 
-#if 1
-  width  = (dir == 1 || dir == 2 ? crumbled_border_size : TILEX);
-  height = (dir == 0 || dir == 3 ? crumbled_border_size : TILEY);
-  cx = (dir == 2 ? TILEX - crumbled_border_size : 0);
-  cy = (dir == 3 ? TILEY - crumbled_border_size : 0);
-#else
-  if (dir == 1 || dir == 2)            /* left or right crumbled border */
-  {
-    width = crumbled_border_size;
-    height = TILEY;
-    cx = (dir == 2 ? TILEX - crumbled_border_size : 0);
-    cy = 0;
-  }
-  else                                 /* top or bottom crumbled border */
-  {
-    width = TILEX;
-    height = crumbled_border_size;
-    cx = 0;
-    cy = (dir == 3 ? TILEY - crumbled_border_size : 0);
-  }
-#endif
+  width  = (dir == 1 || dir == 2 ? crumbled_border_size_var : TILESIZE_VAR);
+  height = (dir == 0 || dir == 3 ? crumbled_border_size_var : TILESIZE_VAR);
+  cx = (dir == 2 ? crumbled_border_pos_var : 0);
+  cy = (dir == 3 ? crumbled_border_pos_var : 0);
 
-#if NEW_TILESIZE
-  BlitBitmap(src_bitmap, drawto_field,
-            src_x + cx * TILESIZE_VAR / TILESIZE,
-            src_y + cy * TILESIZE_VAR / TILESIZE,
-            width * TILESIZE_VAR / TILESIZE,
-            height * TILESIZE_VAR / TILESIZE,
-            FX + sx * TILEX_VAR + cx * TILESIZE_VAR / TILESIZE,
-            FY + sy * TILEY_VAR + cy * TILESIZE_VAR / TILESIZE);
-#else
-  BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy,
-            width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy);
-#endif
+  BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, width, height,
+            FX + sx * TILEX_VAR + cx,
+            FY + sy * TILEY_VAR + cy);
 
   /* (remaining middle border part must be at least as big as corner part) */
   if (!(graphic_info[graphic].style & STYLE_ACCURATE_BORDERS) ||
@@ -2125,8 +1647,7 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame,
 
   /* correct corners of crumbled border, if needed */
 
-#if 1
-  for (i = -1; i <= 1; i+=2)
+  for (i = -1; i <= 1; i += 2)
   {
     int xx = x + (dir == 0 || dir == 3 ? i : 0);
     int yy = y + (dir == 1 || dir == 2 ? i : 0);
@@ -2140,13 +1661,13 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame,
     {
       /* no crumbled corner, but continued crumbled border */
 
-      int c1 = (dir == 2 || dir == 3 ? TILESIZE - crumbled_border_size : 0);
-      int c2 = (i == 1 ? TILESIZE - crumbled_border_size : 0);
-      int b1 = (i == 1 ? crumbled_border_size :
-               TILESIZE - 2 * crumbled_border_size);
+      int c1 = (dir == 2 || dir == 3 ? crumbled_border_pos_var : 0);
+      int c2 = (i == 1 ? crumbled_border_pos_var : 0);
+      int b1 = (i == 1 ? crumbled_border_size_var :
+               TILESIZE_VAR - 2 * crumbled_border_size_var);
 
-      width  = crumbled_border_size;
-      height = crumbled_border_size;
+      width  = crumbled_border_size_var;
+      height = crumbled_border_size_var;
 
       if (dir == 1 || dir == 2)
       {
@@ -2163,80 +1684,12 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame,
        by = cy;
       }
 
-#if NEW_TILESIZE
-      BlitBitmap(src_bitmap, drawto_field,
-                src_x + bx * TILESIZE_VAR / TILESIZE,
-                src_y + by * TILESIZE_VAR / TILESIZE,
-                width * TILESIZE_VAR / TILESIZE,
-                height * TILESIZE_VAR / TILESIZE,
-                FX + sx * TILEX_VAR + cx * TILESIZE_VAR / TILESIZE,
-                FY + sy * TILEY_VAR + cy * TILESIZE_VAR / TILESIZE);
-#else
       BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by,
-                width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy);
-#endif
-    }
-  }
-#else
-  if (dir == 1 || dir == 2)            /* left or right crumbled border */
-  {
-    for (i = -1; i <= 1; i+=2)
-    {
-      int xx = x;
-      int yy = y + i;
-      int element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) :
-                    BorderElement);
-
-      /* check if neighbour field is of same crumble type */
-      if (IS_CRUMBLED_TILE(xx, yy, element) &&
-         graphic_info[graphic].class ==
-         graphic_info[el_act2crm(element, ACTION_DEFAULT)].class)
-      {
-       /* no crumbled corner, but continued crumbled border */
-
-       width  = crumbled_border_size;
-       height = crumbled_border_size;
-       cx = (dir == 2 ? TILEX - crumbled_border_size : 0);
-       cy = (i == 1 ? TILEY - crumbled_border_size : 0);
-       bx = cx;
-       by = (i == 1 ? crumbled_border_size :
-             TILEY - 2 * crumbled_border_size);
-
-       BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by,
-                  width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy);
-      }
+                width, height,
+                FX + sx * TILEX_VAR + cx,
+                FY + sy * TILEY_VAR + cy);
     }
   }
-  else                         /* top or bottom crumbled border */
-  {
-    for (i = -1; i <= 1; i+=2)
-    {
-      int xx = x + i;
-      int yy = y;
-      int element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) :
-                    BorderElement);
-
-      /* check if neighbour field is of same crumble type */
-      if (IS_CRUMBLED_TILE(xx, yy, element) &&
-         graphic_info[graphic].class ==
-         graphic_info[el_act2crm(element, ACTION_DEFAULT)].class)
-      {
-       /* no crumbled corner, but continued crumbled border */
-
-       width  = crumbled_border_size;
-       height = crumbled_border_size;
-       cx = (i == 1 ? TILEX - crumbled_border_size : 0);
-       cy = (dir == 3 ? TILEY - crumbled_border_size : 0);
-       bx = (i == 1 ? crumbled_border_size :
-             TILEX - 2 * crumbled_border_size);
-       by = cy;
-
-       BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by,
-                  width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy);
-      }
-    }
-  }
-#endif
 }
 
 static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
@@ -2272,15 +1725,10 @@ static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
                 BorderElement);
 
       /* check if neighbour field is of same crumble type */
-#if 1
       if (IS_CRUMBLED_TILE(xx, yy, element) &&
          graphic_info[graphic].class ==
          graphic_info[el_act2crm(element, ACTION_DEFAULT)].class)
        continue;
-#else
-      if (IS_CRUMBLED_TILE(xx, yy, element))
-       continue;
-#endif
 
       DrawLevelFieldCrumbledBorders(x, y, graphic, frame, i);
     }
@@ -2336,14 +1784,6 @@ void DrawLevelFieldCrumbled(int x, int y)
   if (!IN_LEV_FIELD(x, y))
     return;
 
-#if 1
-  /* !!! CHECK THIS !!! */
-
-  /*
-  if (Feld[x][y] == EL_ELEMENT_SNAPPING &&
-      GFX_CRUMBLED(GfxElement[x][y]))
-  */
-
   if (Feld[x][y] == EL_ELEMENT_SNAPPING &&
       GfxElement[x][y] != EL_UNDEFINED &&
       GFX_CRUMBLED(GfxElement[x][y]))
@@ -2352,13 +1792,8 @@ void DrawLevelFieldCrumbled(int x, int y)
 
     return;
   }
-#endif
 
-#if 1
   graphic = el_act2crm(TILE_GFX_ELEMENT(x, y), ACTION_DEFAULT);
-#else
-  graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT);
-#endif
 
   DrawLevelFieldCrumbledExt(x, y, graphic, 0);
 }
@@ -2479,22 +1914,8 @@ void DrawScreenField(int x, int y)
             element == EL_DC_MAGIC_WALL_FILLING)
       cut_mode = CUT_BELOW;
 
-#if 0
-    if (lx == 9 && ly == 1)
-      printf("::: %s [%d] [%d, %d] [%d]\n",
-            EL_NAME(TILE_GFX_ELEMENT(lx, ly)),
-            el_act2crm(TILE_GFX_ELEMENT(lx, ly), ACTION_DEFAULT),
-            element_info[EL_QUICKSAND_EMPTYING].graphic[ACTION_DEFAULT],
-            element_info[EL_QUICKSAND_EMPTYING].crumbled[ACTION_DEFAULT],
-            GFX_CRUMBLED(TILE_GFX_ELEMENT(lx, ly)));
-#endif
-
     if (cut_mode == CUT_ABOVE)
-#if 1
       DrawScreenElement(x, y, element);
-#else
-      DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
-#endif
     else
       DrawScreenElement(x, y, EL_EMPTY);
 
@@ -2506,11 +1927,9 @@ void DrawScreenField(int x, int y)
     {
       DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode);
 
-#if 1
       if (cut_mode == CUT_BELOW &&
          IN_LEV_FIELD(lx, ly + 1) && IN_SCR_FIELD(x, y + 1))
        DrawLevelElement(lx, ly + 1, element);
-#endif
     }
 
     if (content == EL_ACID)
@@ -2587,6 +2006,14 @@ void DrawLevelField(int x, int y)
   }
 }
 
+void DrawSizedElement(int x, int y, int element, int tilesize)
+{
+  int graphic;
+
+  graphic = el2edimg(element);
+  DrawSizedGraphic(x, y, graphic, 0, tilesize);
+}
+
 void DrawMiniElement(int x, int y, int element)
 {
   int graphic;
@@ -2595,6 +2022,19 @@ void DrawMiniElement(int x, int y, int element)
   DrawMiniGraphic(x, y, graphic);
 }
 
+void DrawSizedElementOrWall(int sx, int sy, int scroll_x, int scroll_y,
+                           int tilesize)
+{
+  int x = sx + scroll_x, y = sy + scroll_y;
+
+  if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
+    DrawSizedElement(sx, sy, EL_EMPTY, tilesize);
+  else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
+    DrawSizedElement(sx, sy, Feld[x][y], tilesize);
+  else
+    DrawSizedGraphic(sx, sy, el2edimg(getBorderElement(x, y)), 0, tilesize);
+}
+
 void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
 {
   int x = sx + scroll_x, y = sy + scroll_y;
@@ -2639,12 +2079,8 @@ void DrawEnvelopeBackgroundTiles(int graphic, int startx, int starty,
            inner_sy + (y - 1) * tile_height % inner_height);
 
   if (draw_masked)
-  {
-    SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc,
-                 dst_x - src_x, dst_y - src_y);
     BlitBitmapMasked(src_bitmap, drawto, src_x, src_y, tile_width, tile_height,
                     dst_x, dst_y);
-  }
   else
     BlitBitmap(src_bitmap, drawto, src_x, src_y, tile_width, tile_height,
               dst_x, dst_y);
@@ -2669,7 +2105,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
   boolean no_delay = (tape.warp_forward);
   unsigned int anim_delay = 0;
   int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay);
-  int anim_delay_value = (no_delay ? 0 : frame_delay_value);
+  int anim_delay_value = (no_delay ? 0 : frame_delay_value) / 2;
   int font_nr = FONT_ENVELOPE_1 + envelope_nr;
   int font_width = getFontWidth(font_nr);
   int font_height = getFontHeight(font_nr);
@@ -2681,23 +2117,24 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
   int yend = (anim_mode != ANIM_DEFAULT ? max_ysize : 0);
   int xstep = (xstart < xend ? 1 : 0);
   int ystep = (ystart < yend || xstep == 0 ? 1 : 0);
-  int x, y;
+  int start = 0;
+  int end = MAX(xend - xstart, yend - ystart);
+  int i;
 
-  for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep)
+  for (i = start; i <= end; i++)
   {
+    int last_frame = end;      // last frame of this "for" loop
+    int x = xstart + i * xstep;
+    int y = ystart + i * ystep;
     int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2;
     int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2;
     int sx = SX + (SXSIZE - xsize * font_width)  / 2;
     int sy = SY + (SYSIZE - ysize * font_height) / 2;
     int xx, yy;
 
-    SetDrawtoField(DRAW_BUFFERED);
+    SetDrawtoField(DRAW_FIELDBUFFER);
 
-#if 1
     BlitScreenToBitmap(backbuffer);
-#else
-    BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
-#endif
 
     SetDrawtoField(DRAW_BACKBUFFER);
 
@@ -2705,22 +2142,16 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
       for (xx = 0; xx < xsize; xx++)
        DrawEnvelopeBackground(graphic, sx, sy, xx, yy, xsize, ysize, font_nr);
 
-#if 1
     DrawTextBuffer(sx + font_width, sy + font_height,
                   level.envelope[envelope_nr].text, font_nr, max_xsize,
                   xsize - 2, ysize - 2, 0, mask_mode,
                   level.envelope[envelope_nr].autowrap,
                   level.envelope[envelope_nr].centered, FALSE);
-#else
-    DrawTextToTextArea(sx + font_width, sy + font_height,
-                      level.envelope[envelope_nr].text, font_nr, max_xsize,
-                      xsize - 2, ysize - 2, mask_mode);
-#endif
 
-    redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
+    redraw_mask |= REDRAW_FIELD;
     BackToFront();
 
-    WaitUntilDelayReached(&anim_delay, anim_delay_value / 2);
+    SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
   }
 }
 
@@ -2762,19 +2193,63 @@ void ShowEnvelope(int envelope_nr)
 
   game.envelope_active = FALSE;
 
-  SetDrawtoField(DRAW_BUFFERED);
+  SetDrawtoField(DRAW_FIELDBUFFER);
 
   redraw_mask |= REDRAW_FIELD;
   BackToFront();
 }
 
-static void setRequestPosition(int *x, int *y, boolean add_border_size)
+static void setRequestBasePosition(int *x, int *y)
+{
+  int sx_base, sy_base;
+
+  if (request.x != -1)
+    sx_base = request.x;
+  else if (request.align == ALIGN_LEFT)
+    sx_base = SX;
+  else if (request.align == ALIGN_RIGHT)
+    sx_base = SX + SXSIZE;
+  else
+    sx_base = SX + SXSIZE / 2;
+
+  if (request.y != -1)
+    sy_base = request.y;
+  else if (request.valign == VALIGN_TOP)
+    sy_base = SY;
+  else if (request.valign == VALIGN_BOTTOM)
+    sy_base = SY + SYSIZE;
+  else
+    sy_base = SY + SYSIZE / 2;
+
+  *x = sx_base;
+  *y = sy_base;
+}
+
+static void setRequestPositionExt(int *x, int *y, int width, int height,
+                                 boolean add_border_size)
 {
   int border_size = request.border_size;
-  int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2);
-  int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2);
-  int sx = sx_center - request.width  / 2;
-  int sy = sy_center - request.height / 2;
+  int sx_base, sy_base;
+  int sx, sy;
+
+  setRequestBasePosition(&sx_base, &sy_base);
+
+  if (request.align == ALIGN_LEFT)
+    sx = sx_base;
+  else if (request.align == ALIGN_RIGHT)
+    sx = sx_base - width;
+  else
+    sx = sx_base - width  / 2;
+
+  if (request.valign == VALIGN_TOP)
+    sy = sy_base;
+  else if (request.valign == VALIGN_BOTTOM)
+    sy = sy_base - height;
+  else
+    sy = sy_base - height / 2;
+
+  sx = MAX(0, MIN(sx, WIN_XSIZE - width));
+  sy = MAX(0, MIN(sy, WIN_YSIZE - height));
 
   if (add_border_size)
   {
@@ -2786,8 +2261,14 @@ static void setRequestPosition(int *x, int *y, boolean add_border_size)
   *y = sy;
 }
 
+static void setRequestPosition(int *x, int *y, boolean add_border_size)
+{
+  setRequestPositionExt(x, y, request.width, request.height, add_border_size);
+}
+
 void DrawEnvelopeRequest(char *text)
 {
+  int last_game_status = game_status;  /* save current game status */
   char *text_final = text;
   char *text_door_style = NULL;
   int graphic = IMG_BACKGROUND_REQUEST;
@@ -2799,19 +2280,25 @@ void DrawEnvelopeRequest(char *text)
   int border_size = request.border_size;
   int line_spacing = request.line_spacing;
   int line_height = font_height + line_spacing;
-  int text_width = request.width - 2 * border_size;
-  int text_height = request.height - 2 * border_size;
-  int line_length = text_width / font_width;
-  int max_lines = text_height / line_height;
+  int max_text_width  = request.width  - 2 * border_size;
+  int max_text_height = request.height - 2 * border_size;
+  int line_length = max_text_width  / font_width;
+  int max_lines   = max_text_height / line_height;
+  int text_width = line_length * font_width;
   int width = request.width;
   int height = request.height;
-  int tile_size = request.step_offset;
+  int tile_size = MAX(request.step_offset, 1);
   int x_steps = width  / tile_size;
   int y_steps = height / tile_size;
+  int sx_offset = border_size;
+  int sy_offset = border_size;
   int sx, sy;
   int i, x, y;
 
-  if (request.wrap_single_words)
+  if (request.centered)
+    sx_offset = (request.width - text_width) / 2;
+
+  if (request.wrap_single_words && !request.autowrap)
   {
     char *src_text_ptr, *dst_text_ptr;
 
@@ -2848,62 +2335,40 @@ void DrawEnvelopeRequest(char *text)
                                  x, y, x_steps, y_steps,
                                  tile_size, tile_size);
 
-  DrawTextBuffer(sx + border_size, sy + border_size, text_final, font_nr,
+  /* force DOOR font inside door area */
+  game_status = GAME_MODE_PSEUDO_DOOR;
+
+  DrawTextBuffer(sx + sx_offset, sy + sy_offset, text_final, font_nr,
                 line_length, -1, max_lines, line_spacing, mask_mode,
                 request.autowrap, request.centered, FALSE);
 
+  game_status = last_game_status;      /* restore current game status */
+
   for (i = 0; i < NUM_TOOL_BUTTONS; i++)
     RedrawGadget(tool_gadget[i]);
 
   // store readily prepared envelope request for later use when animating
   BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
-#if 0
-  // !!! TEST !!!
-  BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-  BlitBitmap(bitmap_db_cross, backbuffer, sx, sy, width, height, sx, sy);
-
-  redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-  BackToFront();
-
-  Delay(3000);
-
-  BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-
-  redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-  BackToFront();
-
-  Delay(1000);
-#endif
-
   if (text_door_style)
     free(text_door_style);
 }
 
-#if 1
-
 void AnimateEnvelopeRequest(int anim_mode, int action)
 {
   int graphic = IMG_BACKGROUND_REQUEST;
   boolean draw_masked = graphic_info[graphic].draw_masked;
-#if 1
   int delay_value_normal = request.step_delay;
   int delay_value_fast = delay_value_normal / 2;
-#else
-  int delay_value_normal = GameFrameDelay;
-  int delay_value_fast = FfwdFrameDelay;
-#endif
   boolean ffwd_delay = (tape.playing && tape.fast_forward);
   boolean no_delay = (tape.warp_forward);
   int delay_value = (ffwd_delay ? delay_value_fast : delay_value_normal);
-  int anim_delay_value = (no_delay ? 0 : delay_value + 500 * 0);
+  int anim_delay_value = (no_delay ? 0 : delay_value + 500 * 0) / 2;
   unsigned int anim_delay = 0;
 
-  int width = request.width;
-  int height = request.height;
-  int tile_size = request.step_offset;
-  int max_xsize = width  / tile_size;
-  int max_ysize = height / tile_size;
+  int tile_size = MAX(request.step_offset, 1);
+  int max_xsize = request.width  / tile_size;
+  int max_ysize = request.height / tile_size;
   int max_xsize_inner = max_xsize - 2;
   int max_ysize_inner = max_ysize - 2;
 
@@ -2913,27 +2378,46 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
   int yend = (anim_mode != ANIM_DEFAULT ? max_ysize_inner : 0);
   int xstep = (xstart < xend ? 1 : 0);
   int ystep = (ystart < yend || xstep == 0 ? 1 : 0);
-  int x, y;
+  int start = 0;
+  int end = MAX(xend - xstart, yend - ystart);
+  int i;
+
+  if (setup.quick_doors)
+  {
+    xstart = xend;
+    ystart = yend;
+    end = 0;
+  }
+  else
+  {
+    if (action == ACTION_OPENING)
+      PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
+    else if (action == ACTION_CLOSING)
+      PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
+  }
 
-  for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep)
+  for (i = start; i <= end; i++)
   {
+    int last_frame = end;      // last frame of this "for" loop
+    int x = xstart + i * xstep;
+    int y = ystart + i * ystep;
     int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2;
     int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2;
-    int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2);
-    int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2);
-    int src_x = sx_center - width  / 2;
-    int src_y = sy_center - height / 2;
-    int dst_x = sx_center - xsize * tile_size / 2;
-    int dst_y = sy_center - ysize * tile_size / 2;
     int xsize_size_left = (xsize - 1) * tile_size;
     int ysize_size_top  = (ysize - 1) * tile_size;
     int max_xsize_pos = (max_xsize - 1) * tile_size;
     int max_ysize_pos = (max_ysize - 1) * tile_size;
+    int width  = xsize * tile_size;
+    int height = ysize * tile_size;
+    int src_x, src_y;
+    int dst_x, dst_y;
     int xx, yy;
 
+    setRequestPosition(&src_x, &src_y, FALSE);
+    setRequestPositionExt(&dst_x, &dst_y, width, height, FALSE);
+
     BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
-#if 1
     for (yy = 0; yy < 2; yy++)
     {
       for (xx = 0; xx < 2; xx++)
@@ -2953,445 +2437,142 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
                     src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy);
       }
     }
-#else
-    BlitBitmap(bitmap_db_cross, backbuffer,
-              src_x, src_y,
-              xsize_size_left, ysize_size_top,
-              dst_x, dst_y);
-    BlitBitmap(bitmap_db_cross, backbuffer,
-              src_x + max_xsize_pos, src_y,
-              tile_size, ysize_size_top,
-              dst_x + xsize_size_left, dst_y);
-    BlitBitmap(bitmap_db_cross, backbuffer,
-              src_x, src_y + max_ysize_pos,
-              xsize_size_left, tile_size,
-              dst_x, dst_y + ysize_size_top);
-    BlitBitmap(bitmap_db_cross, backbuffer,
-              src_x + max_xsize_pos, src_y + max_ysize_pos,
-              tile_size, tile_size,
-              dst_x + xsize_size_left, dst_y + ysize_size_top);
-#endif
 
-#if 1
-    redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-    // redraw_mask |= REDRAW_ALL | REDRAW_FROM_BACKBUFFER;
-#else
-    redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-#endif
+    redraw_mask |= REDRAW_FIELD;
 
-#if 1
     DoAnimation();
     BackToFront();
-#else
-    BackToFront();
-#endif
 
-    WaitUntilDelayReached(&anim_delay, anim_delay_value / 2);
+    SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame);
   }
 }
 
-#else
-
-void AnimateEnvelopeRequest(char *text, int anim_mode, int action)
+void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
 {
-#if 0
-  int envelope_nr = 0;
-#endif
-#if 1
   int graphic = IMG_BACKGROUND_REQUEST;
-#else
-  int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr;
-#endif
-  Bitmap *src_bitmap = graphic_info[graphic].bitmap;
-  int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND);
-  boolean ffwd_delay = (tape.playing && tape.fast_forward);
-  boolean no_delay = (tape.warp_forward);
-  unsigned int anim_delay = 0;
-  int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay);
-  int anim_delay_value = (no_delay ? 0 : frame_delay_value + 500 * 0);
-#if 1
-  int max_word_len = maxWordLengthInString(text);
-  int font_nr = (max_word_len > 7 ? FONT_TEXT_1 : FONT_TEXT_2);
-#else
-  int font_nr = FONT_ENVELOPE_1 + envelope_nr;
-#endif
-  int font_width = getFontWidth(font_nr);
-  int font_height = getFontHeight(font_nr);
-  int line_spacing = 2 * 1;
-#if 1
+  int sound_opening = SND_REQUEST_OPENING;
+  int sound_closing = SND_REQUEST_CLOSING;
+  int anim_mode_1 = request.anim_mode;                 /* (higher priority) */
+  int anim_mode_2 = graphic_info[graphic].anim_mode;   /* (lower priority) */
+  int anim_mode = (anim_mode_1 != ANIM_DEFAULT ? anim_mode_1 : anim_mode_2);
+  int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL:
+                       anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode);
 
-#if 1
-  int max_xsize = DXSIZE / font_width;
-  // int max_ysize = DYSIZE / font_height;
-  int max_ysize = DYSIZE / (font_height + line_spacing);
-#else
-  int max_xsize = 7;   /* tools.c: MAX_REQUEST_LINE_FONT1_LEN == 7 */
-  int max_ysize = 13;  /* tools.c: MAX_REQUEST_LINES == 13 */
-#endif
+  if (game_status == GAME_MODE_PLAYING)
+    BlitScreenToBitmap(backbuffer);
 
-#else
-  int max_xsize = level.envelope[envelope_nr].xsize;
-  int max_ysize = level.envelope[envelope_nr].ysize;
-#endif
-  int xstart = (anim_mode & ANIM_VERTICAL ? max_xsize : 0);
-  int ystart = (anim_mode & ANIM_HORIZONTAL ? max_ysize : 0);
-  int xend = max_xsize;
-  int yend = (anim_mode != ANIM_DEFAULT ? max_ysize : 0);
-  int xstep = (xstart < xend ? 1 : 0);
-  int ystep = (ystart < yend || xstep == 0 ? 1 : 0);
-  int x, y;
+  SetDrawtoField(DRAW_BACKBUFFER);
 
-#if 1
-  char *text_ptr;
-  char *text_copy = getStringCopy(text);
-#else
-#if 1
-  font_nr = FONT_TEXT_2;
+  // SetDrawBackgroundMask(REDRAW_NONE);
 
-  if (maxWordLengthInString(text) > 7) /* MAX_REQUEST_LINE_FONT1_LEN == 7 */
+  if (action == ACTION_OPENING)
   {
-    max_xsize = 10;    /* tools.c: MAX_REQUEST_LINE_FONT2_LEN == 10 */
-    font_nr = FONT_TEXT_1;
+    BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+
+    if (req_state & REQ_ASK)
+    {
+      MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
+    }
+    else if (req_state & REQ_CONFIRM)
+    {
+      MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
+    }
+    else if (req_state & REQ_PLAYER)
+    {
+      MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
+      MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
+    }
+
+    DrawEnvelopeRequest(text);
+
+    if (game_status != GAME_MODE_MAIN)
+      InitAnimation();
   }
-#else
-  int max_word_len = 0;
-  char *text_ptr;
-  char *text_copy = getStringCopy(text);
 
-  font_nr = FONT_TEXT_2;
+  game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */
 
-  for (text_ptr = text; *text_ptr; text_ptr++)
+  if (action == ACTION_OPENING)
   {
-    max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0);
+    PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE);
 
-    if (max_word_len > 7)      /* tools.c: MAX_REQUEST_LINE_FONT1_LEN == 7 */
-    {
-      max_xsize = 10;  /* tools.c: MAX_REQUEST_LINE_FONT2_LEN == 10 */
-      font_nr = FONT_TEXT_1;
+    if (anim_mode == ANIM_DEFAULT)
+      AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING);
 
-      break;
-    }
+    AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING);
   }
-#endif
-#endif
+  else
+  {
+    PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE);
 
-#if 1
-  for (text_ptr = text_copy; *text_ptr; text_ptr++)
-    if (*text_ptr == ' ')
-      *text_ptr = '\n';
-#endif
+    if (anim_mode != ANIM_NONE)
+      AnimateEnvelopeRequest(main_anim_mode, ACTION_CLOSING);
 
-#if 1
-  dDX = SX + (SXSIZE - DXSIZE) / 2 - DX;
-  dDY = SY + (SYSIZE - DYSIZE) / 2 - DY;
-#else
-  dDX = SX + SXSIZE / 2 - max_xsize * font_width  / 2 - DX;
-  dDY = SY + SYSIZE / 2 - max_ysize * font_height / 2 - DY;
-#endif
+    if (anim_mode == ANIM_DEFAULT)
+      AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_CLOSING);
+  }
+
+  game.envelope_active = FALSE;
 
-  for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep)
+  if (action == ACTION_CLOSING)
   {
-    int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2;
-    int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2;
-    int sx = SX + (SXSIZE - xsize * font_width)  / 2;
-    // int sy = SX + (SYSIZE - ysize * font_height) / 2;
-    int sy = SY + (SYSIZE - ysize * (font_height + line_spacing)) / 2;
-    int xx, yy;
+    if (game_status != GAME_MODE_MAIN)
+      StopAnimation();
 
-#if 1
     BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-#else
-    SetDrawtoField(DRAW_BUFFERED);
+  }
 
-#if 1
-    BlitScreenToBitmap(backbuffer);
-#else
-    BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
-#endif
+  // SetDrawBackgroundMask(last_draw_background_mask);
 
-    SetDrawtoField(DRAW_BACKBUFFER);
-#endif
+  redraw_mask |= REDRAW_FIELD;
 
-    for (yy = 0; yy < ysize; yy++)
-      for (xx = 0; xx < xsize; xx++)
-       DrawEnvelopeBackgroundTiles(graphic, sx, sy, xx, yy, xsize, ysize,
-                                   getFontWidth(font_nr),
-                                   getFontHeight(font_nr) + line_spacing);
+  if (game_status == GAME_MODE_MAIN)
+    DoAnimation();
 
-#if 1
+  BackToFront();
 
-#if 1
-    DrawTextBuffer(sx + font_width, sy + font_height + 8,
-                  text_copy, font_nr, max_xsize,
-                  xsize - 2, ysize - 2, line_spacing, mask_mode,
-                  FALSE, TRUE, FALSE);
-#else
-    DrawTextBuffer(sx + font_width, sy + font_height,
-                  level.envelope[envelope_nr].text, font_nr, max_xsize,
-                  xsize - 2, ysize - 2, 0, mask_mode,
-                  level.envelope[envelope_nr].autowrap,
-                  level.envelope[envelope_nr].centered, FALSE);
-#endif
+  if (action == ACTION_CLOSING &&
+      game_status == GAME_MODE_PLAYING &&
+      level.game_engine_type == GAME_ENGINE_TYPE_RND)
+    SetDrawtoField(DRAW_FIELDBUFFER);
+}
 
-#else
-    DrawTextToTextArea(sx + font_width, sy + font_height,
-                      level.envelope[envelope_nr].text, font_nr, max_xsize,
-                      xsize - 2, ysize - 2, mask_mode);
-#endif
+void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
+{
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int graphic = el2preimg(element);
 
-    /* copy request gadgets to door backbuffer */
-#if 1
-    /*
-    if ((ysize - 2) > 13)
-      BlitBitmap(bitmap_db_door, drawto,
-                DOOR_GFX_PAGEX1 + (DXSIZE - (xsize - 2) * font_width) / 2,
-                DOOR_GFX_PAGEY1 + 13 * font_height,
-                (xsize - 2) * font_width,
-                (ysize - 2 - 13) * font_height,
-                sx + font_width,
-                sy + font_height * (1 + 13));
-    */
-    if ((ysize - 2) > 13)
-      BlitBitmap(bitmap_db_door, drawto,
-                DOOR_GFX_PAGEX1 + (DXSIZE - (xsize - 2) * font_width) / 2,
-                DOOR_GFX_PAGEY1 + 11 * (font_height + line_spacing * 0),
-                (xsize - 2) * font_width,
-                (ysize - 2 - 13) * (font_height + line_spacing),
-                sx + font_width,
-                sy + (font_height + line_spacing) * (1 + 13));
-#else
-    if ((ysize - 2) > 13)
-      BlitBitmap(bitmap_db_door, drawto,
-                DOOR_GFX_PAGEX1 + (DXSIZE - (xsize - 2) * font_width) / 2,
-                DOOR_GFX_PAGEY1 + 13 * font_height,
-                (xsize - 2) * font_width,
-                (ysize - 2 - 13) * font_height,
-                sx + font_width,
-                sy + font_height * (1 + 13));
-#endif
+  getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y);
+  BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y);
+}
 
-#if 1
-    redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-    // redraw_mask |= REDRAW_ALL | REDRAW_FROM_BACKBUFFER;
-#else
-    redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-#endif
+void DrawLevel(int draw_background_mask)
+{
+  int x,y;
 
-#if 1
-    DoAnimation();
-    BackToFront();
-#else
-    BackToFront();
-#endif
+  SetMainBackgroundImage(IMG_BACKGROUND_PLAYING);
+  SetDrawBackgroundMask(draw_background_mask);
 
-    WaitUntilDelayReached(&anim_delay, anim_delay_value / 2);
-  }
+  ClearField();
 
-#if 1
-  free(text_copy);
-#endif
-}
+  for (x = BX1; x <= BX2; x++)
+    for (y = BY1; y <= BY2; y++)
+      DrawScreenField(x, y);
 
-#endif
+  redraw_mask |= REDRAW_FIELD;
+}
 
-void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
-{
-#if 1
-  int last_game_status = game_status;  /* save current game status */
-  // int last_draw_background_mask = gfx.draw_background_mask;
-#endif
-#if 1
-  int graphic = IMG_BACKGROUND_REQUEST;
-  int sound_opening = SND_REQUEST_OPENING;
-  int sound_closing = SND_REQUEST_CLOSING;
-#else
-  int envelope_nr = 0;
-  int element = EL_ENVELOPE_1 + envelope_nr;
-  int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr;
-  int sound_opening = element_info[element].sound[ACTION_OPENING];
-  int sound_closing = element_info[element].sound[ACTION_CLOSING];
-#endif
-#if 0
-  boolean ffwd_delay = (tape.playing && tape.fast_forward);
-  boolean no_delay = (tape.warp_forward);
-  int normal_delay_value = ONE_SECOND_DELAY / (ffwd_delay ? 2 : 1);
-  int wait_delay_value = (no_delay ? 0 : normal_delay_value);
-#endif
-  int anim_mode = graphic_info[graphic].anim_mode;
-  int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL:
-                       anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode);
-#if 0
-  char *text_copy = getStringCopy(text);
-  char *text_ptr;
-
-  for (text_ptr = text_copy; *text_ptr; text_ptr++)
-    if (*text_ptr == ' ')
-      *text_ptr = '\n';
-#endif
-
-#if 1
-  if (game_status == GAME_MODE_PLAYING)
-  {
-    if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-      BlitScreenToBitmap_EM(backbuffer);
-    else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-      BlitScreenToBitmap_SP(backbuffer);
-    else
-    {
-      BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
-    }
-  }
-
-  SetDrawtoField(DRAW_BACKBUFFER);
-
-  // SetDrawBackgroundMask(REDRAW_NONE);
-
-  if (action == ACTION_OPENING)
-  {
-    BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-
-#if 1
-  if (req_state & REQ_ASK)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
-  }
-  else if (req_state & REQ_CONFIRM)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
-  }
-  else if (req_state & REQ_PLAYER)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
-  }
-#endif
-
-#if 1
-    DrawEnvelopeRequest(text);
-#else
-    DrawEnvelopeRequest(text_copy);
-#endif
-
-    if (game_status != GAME_MODE_MAIN)
-      InitAnimation();
-  }
-
-  /* force DOOR font inside door area */
-  game_status = GAME_MODE_PSEUDO_DOOR;
-#endif
-
-  game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */
-
-  if (action == ACTION_OPENING)
-  {
-    PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE);
-
-    if (anim_mode == ANIM_DEFAULT)
-      AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING);
-
-    AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING);
-
-#if 0
-    if (tape.playing)
-      Delay(wait_delay_value);
-    else
-      WaitForEventToContinue();
-#endif
-  }
-  else
-  {
-    PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE);
-
-    if (anim_mode != ANIM_NONE)
-      AnimateEnvelopeRequest(main_anim_mode, ACTION_CLOSING);
-
-    if (anim_mode == ANIM_DEFAULT)
-      AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_CLOSING);
-  }
-
-  game.envelope_active = FALSE;
-
-#if 1
-  // game_status = last_game_status;   /* restore current game status */
-
-  if (action == ACTION_CLOSING)
-  {
-    if (game_status != GAME_MODE_MAIN)
-      StopAnimation();
-
-    BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-  }
-#else
-  SetDrawtoField(DRAW_BUFFERED);
-#endif
-
-  // SetDrawBackgroundMask(last_draw_background_mask);
-
-#if 1
-  redraw_mask = REDRAW_FIELD;
-  // redraw_mask |= REDRAW_ALL;
-#else
-  redraw_mask |= REDRAW_FIELD;
-#endif
-
-#if 1
-  if (game_status == GAME_MODE_MAIN)
-    DoAnimation();
-
-  BackToFront();
-
-  /* (important: after "BackToFront()", but before "SetDrawtoField()") */
-  game_status = last_game_status;      /* restore current game status */
-
-#if 1
-  if (action == ACTION_CLOSING &&
-      game_status == GAME_MODE_PLAYING &&
-      level.game_engine_type == GAME_ENGINE_TYPE_RND)
-    SetDrawtoField(DRAW_BUFFERED);
-#else
-  if (game_status == GAME_MODE_PLAYING &&
-      level.game_engine_type == GAME_ENGINE_TYPE_RND)
-    SetDrawtoField(DRAW_BUFFERED);
-#endif
-
-#else
-  BackToFront();
-#endif
-
-#if 0
-  free(text_copy);
-#endif
-}
-
-void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
-{
-  Bitmap *src_bitmap;
-  int src_x, src_y;
-  int graphic = el2preimg(element);
-
-  getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y);
-  BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y);
-}
-
-void DrawLevel()
+void DrawSizedLevel(int size_x, int size_y, int scroll_x, int scroll_y,
+                   int tilesize)
 {
   int x,y;
 
-#if 1
-  SetMainBackgroundImage(IMG_BACKGROUND_PLAYING);
-  SetDrawBackgroundMask(REDRAW_FIELD);
-#else
-  SetDrawBackgroundMask(REDRAW_NONE);
-#endif
-
-  ClearField();
-
-  for (x = BX1; x <= BX2; x++)
-    for (y = BY1; y <= BY2; y++)
-      DrawScreenField(x, y);
+  for (x = 0; x < size_x; x++)
+    for (y = 0; y < size_y; y++)
+      DrawSizedElementOrWall(x, y, scroll_x, scroll_y, tilesize);
 
   redraw_mask |= REDRAW_FIELD;
 }
@@ -3423,22 +2604,13 @@ static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y)
   int dst_y = SY + ALIGNED_YPOS(preview.y, preview_height, preview.valign);
   int x, y;
 
-#if 1
   if (!IN_GFX_FIELD_FULL(dst_x, dst_y + preview_height - 1))
     return;
-#endif
-
-#if 0
-  dst_x += (preview_width  - real_preview_width)  / 2;
-  dst_y += (preview_height - real_preview_height) / 2;
 
-  DrawBackground(dst_x, dst_y, real_preview_width, real_preview_height);
-#else
   DrawBackground(dst_x, dst_y, preview_width, preview_height);
 
   dst_x += (preview_width  - real_preview_width)  / 2;
   dst_y += (preview_height - real_preview_height) / 2;
-#endif
 
   for (x = 0; x < real_preview_xsize; x++)
   {
@@ -3454,7 +2626,7 @@ static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y)
     }
   }
 
-  redraw_mask |= REDRAW_MICROLEVEL;
+  redraw_mask |= REDRAW_FIELD;
 }
 
 #define MICROLABEL_EMPTY               0
@@ -3486,7 +2658,6 @@ static void DrawPreviewLevelLabelExt(int mode)
   struct TextPosInfo *pos = &menu.main.text.level_info_2;
   char label_text[MAX_OUTPUT_LINESIZE + 1];
   int max_len_label_text;
-#if 1
   int font_nr = pos->font;
   int i;
 
@@ -3497,42 +2668,18 @@ static void DrawPreviewLevelLabelExt(int mode)
       mode == MICROLABEL_IMPORTED_FROM_HEAD ||
       mode == MICROLABEL_IMPORTED_BY_HEAD)
     font_nr = pos->font_alt;
-#else
-  int font_nr = FONT_TEXT_2;
-  int i;
-
-  if (mode == MICROLABEL_LEVEL_AUTHOR_HEAD ||
-      mode == MICROLABEL_IMPORTED_FROM_HEAD ||
-      mode == MICROLABEL_IMPORTED_BY_HEAD)
-    font_nr = FONT_TEXT_3;
-#endif
 
-#if 1
   max_len_label_text = getMaxTextLength(pos, font_nr);
-#else
-  max_len_label_text = SXSIZE / getFontWidth(font_nr);
-#endif
 
-#if 1
   if (pos->size != -1)
     max_len_label_text = pos->size;
-#endif
 
   for (i = 0; i < max_len_label_text; i++)
     label_text[i] = ' ';
   label_text[max_len_label_text] = '\0';
 
   if (strlen(label_text) > 0)
-  {
-#if 1
     DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
-#else
-    int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2;
-    int lypos = MICROLABEL2_YPOS;
-
-    DrawText(lxpos, lypos, label_text, font_nr);
-#endif
-  }
 
   strncpy(label_text,
          (mode == MICROLABEL_LEVEL_NAME ? level.name :
@@ -3546,18 +2693,9 @@ static void DrawPreviewLevelLabelExt(int mode)
   label_text[max_len_label_text] = '\0';
 
   if (strlen(label_text) > 0)
-  {
-#if 1
     DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
-#else
-    int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2;
-    int lypos = MICROLABEL2_YPOS;
-
-    DrawText(lxpos, lypos, label_text, font_nr);
-#endif
-  }
 
-  redraw_mask |= REDRAW_MICROLEVEL;
+  redraw_mask |= REDRAW_FIELD;
 }
 
 static void DrawPreviewLevelExt(boolean restart)
@@ -3572,11 +2710,6 @@ static void DrawPreviewLevelExt(boolean restart)
   int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
   int last_game_status = game_status;          /* save current game status */
 
-#if 0
-  /* force PREVIEW font on preview level */
-  game_status = GAME_MODE_PSEUDO_PREVIEW;
-#endif
-
   if (restart)
   {
     from_x = 0;
@@ -3608,38 +2741,17 @@ static void DrawPreviewLevelExt(boolean restart)
     {
       struct TextPosInfo *pos = &menu.main.text.level_info_1;
       char label_text[MAX_OUTPUT_LINESIZE + 1];
-#if 1
       int font_nr = pos->font;
-#else
-      int font_nr = FONT_TEXT_1;
-#endif
-#if 1
       int max_len_label_text = getMaxTextLength(pos, font_nr);
-#else
-      int max_len_label_text = SXSIZE / getFontWidth(font_nr);
-#endif
-#if 0
-      int text_width;
-      int lxpos, lypos;
-#endif
 
-#if 1
       if (pos->size != -1)
        max_len_label_text = pos->size;
-#endif
 
       strncpy(label_text, leveldir_current->name, max_len_label_text);
       label_text[max_len_label_text] = '\0';
 
-#if 1
       if (IN_GFX_FIELD_FULL(pos->x, pos->y + getFontHeight(pos->font)))
        DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align);
-#else
-      lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2;
-      lypos = SY + MICROLABEL1_YPOS;
-
-      DrawText(lxpos, lypos, label_text, font_nr);
-#endif
     }
 
     game_status = last_game_status;    /* restore current game status */
@@ -3757,8 +2869,9 @@ void DrawPreviewLevelAnimation()
   DrawPreviewLevelExt(FALSE);
 }
 
-inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
-                                   int graphic, int sync_frame, int mask_mode)
+inline static void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
+                                          int graphic, int sync_frame,
+                                          int mask_mode)
 {
   int frame = getGraphicAnimationFrame(graphic, sync_frame);
 
@@ -3768,9 +2881,8 @@ inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
     DrawGraphicExt(dst_bitmap, x, y, graphic, frame);
 }
 
-inline void DrawFixedGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
-                                        int graphic, int sync_frame,
-                                        int mask_mode)
+void DrawFixedGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
+                                 int graphic, int sync_frame, int mask_mode)
 {
   int frame = getGraphicAnimationFrame(graphic, sync_frame);
 
@@ -3780,24 +2892,20 @@ inline void DrawFixedGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
     DrawFixedGraphicExt(dst_bitmap, x, y, graphic, frame);
 }
 
-inline void DrawGraphicAnimation(int x, int y, int graphic)
+inline static void DrawGraphicAnimation(int x, int y, int graphic)
 {
   int lx = LEVELX(x), ly = LEVELY(y);
 
   if (!IN_SCR_FIELD(x, y))
     return;
 
-#if NEW_TILESIZE
   DrawGraphicAnimationExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR,
                          graphic, GfxFrame[lx][ly], NO_MASKING);
-#else
-  DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
-                         graphic, GfxFrame[lx][ly], NO_MASKING);
-#endif
+
   MarkTileDirty(x, y);
 }
 
-inline void DrawFixedGraphicAnimation(int x, int y, int graphic)
+void DrawFixedGraphicAnimation(int x, int y, int graphic)
 {
   int lx = LEVELX(x), ly = LEVELY(y);
 
@@ -3821,7 +2929,7 @@ void DrawLevelElementAnimation(int x, int y, int element)
   DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
 }
 
-inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
+void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
 {
   int sx = SCREENX(x), sy = SCREENY(y);
 
@@ -4042,15 +3150,10 @@ void DrawPlayer(struct PlayerInfo *player)
       GfxElement[jx][jy] = EL_UNDEFINED;
 
       /* make sure that pushed elements are drawn with correct frame rate */
-#if 1
       graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir);
 
       if (player->is_pushing && player->is_moving && !IS_ANIM_MODE_CE(graphic))
        GfxFrame[jx][jy] = player->StepFrame;
-#else
-      if (player->is_pushing && player->is_moving)
-       GfxFrame[jx][jy] = player->StepFrame;
-#endif
 
       DrawLevelField(jx, jy);
     }
@@ -4078,9 +3181,6 @@ void DrawPlayer(struct PlayerInfo *player)
       syy = player->GfxPos;
   }
 
-  if (!setup.soft_scrolling && ScreenMovPos)
-    sxx = syy = 0;
-
   if (player_is_opaque)
     DrawGraphicShifted(sx, sy, sxx, syy, graphic, frame,NO_CUTTING,NO_MASKING);
   else
@@ -4110,13 +3210,6 @@ void DrawPlayer(struct PlayerInfo *player)
   /* draw things the player is pushing, if needed                            */
   /* ----------------------------------------------------------------------- */
 
-#if 0
-  printf("::: %d, %d [%d, %d] [%d]\n",
-        player->is_pushing, player_is_moving, player->GfxAction,
-        player->is_moving, player_is_moving);
-#endif
-
-#if 1
   if (player->is_pushing && player->is_moving)
   {
     int px = SCREENX(jx), py = SCREENY(jy);
@@ -4136,15 +3229,10 @@ void DrawPlayer(struct PlayerInfo *player)
 
     graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir);
 
-#if 1
     sync_frame = (IS_ANIM_MODE_CE(graphic) ? gfx_frame : player->StepFrame);
     frame = getGraphicAnimationFrame(graphic, sync_frame);
-#else
-    frame = getGraphicAnimationFrame(graphic, player->StepFrame);
-#endif
 
     /* draw background element under pushed element (like the Sokoban field) */
-#if 1
     if (game.use_masked_pushing && IS_MOVING(jx, jy))
     {
       /* this allows transparent pushing animation over non-black background */
@@ -4161,20 +3249,6 @@ void DrawPlayer(struct PlayerInfo *player)
     }
     else if (Back[next_jx][next_jy])
       DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]);
-#else
-    if (Back[next_jx][next_jy])
-      DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]);
-#endif
-
-#if 0
-    printf("::: %d, %d, %d, %d [%d] [%d, %d, %d] [%d] [%d, %d] [%d, %d]\n",
-          jx, px, player->GfxPos, player->StepFrame,
-          player->is_pushing,
-          dx, sxx, pxx,
-          IS_MOVING(jx, jy),
-          graphic, frame,
-          GfxFrame[jx][jy], GfxFrame[next_jx][next_jy]);
-#endif
 
 #if 1
     /* do not draw (EM style) pushing animation when pushing is finished */
@@ -4189,7 +3263,6 @@ void DrawPlayer(struct PlayerInfo *player)
     DrawGraphicShiftedThruMask(px, py, pxx, pyy, graphic, frame, NO_CUTTING);
 #endif
   }
-#endif
 
 #if DRAW_PLAYER_OVER_PUSHED_ELEMENT
   /* ----------------------------------------------------------------------- */
@@ -4213,9 +3286,6 @@ void DrawPlayer(struct PlayerInfo *player)
       syy = player->GfxPos;
   }
 
-  if (!setup.soft_scrolling && ScreenMovPos)
-    sxx = syy = 0;
-
   if (player_is_opaque)
     DrawGraphicShifted(sx, sy, sxx, syy, graphic, frame,NO_CUTTING,NO_MASKING);
   else
@@ -4297,9 +3367,7 @@ void WaitForEventToContinue()
 
   button_status = MB_RELEASED;
 
-#if 1
   ClearEventQueue();
-#endif
 
   while (still_wait)
   {
@@ -4341,13 +3409,16 @@ void WaitForEventToContinue()
 #define MAX_REQUEST_LINE_FONT1_LEN     7
 #define MAX_REQUEST_LINE_FONT2_LEN     10
 
-#if 1
-
 static int RequestHandleEvents(unsigned int req_state)
 {
-  int last_game_status = game_status;  /* save current game status */
+  boolean level_solved = (game_status == GAME_MODE_PLAYING &&
+                         local_player->LevelSolved_GameEnd);
+  int width  = request.width;
+  int height = request.height;
+  int sx, sy;
   int result;
-  int mx, my;
+
+  setRequestPosition(&sx, &sy, FALSE);
 
   button_status = MB_RELEASED;
 
@@ -4356,110 +3427,128 @@ static int RequestHandleEvents(unsigned int req_state)
 
   while (result < 0)
   {
+    if (level_solved)
+    {
+      SetDrawtoField(DRAW_FIELDBUFFER);
+
+      HandleGameActions();
+
+      SetDrawtoField(DRAW_BACKBUFFER);
+
+      if (global.use_envelope_request)
+      {
+       /* copy current state of request area to middle of playfield area */
+       BlitBitmap(bitmap_db_cross, drawto, sx, sy, width, height, sx, sy);
+      }
+    }
+
     if (PendingEvent())
     {
       Event event;
 
-      NextEvent(&event);
-
-      switch (event.type)
+      while (NextValidEvent(&event))
       {
-       case EVENT_BUTTONPRESS:
-       case EVENT_BUTTONRELEASE:
-       case EVENT_MOTIONNOTIFY:
+       switch (event.type)
        {
-         if (event.type == EVENT_MOTIONNOTIFY)
+         case EVENT_BUTTONPRESS:
+         case EVENT_BUTTONRELEASE:
+         case EVENT_MOTIONNOTIFY:
          {
-           if (!PointerInWindow(window))
-             continue; /* window and pointer are on different screens */
+           int mx, my;
 
-           if (!button_status)
-             continue;
+           if (event.type == EVENT_MOTIONNOTIFY)
+           {
+             if (!button_status)
+               continue;
 
-           motion_status = TRUE;
-           mx = ((MotionEvent *) &event)->x;
-           my = ((MotionEvent *) &event)->y;
-         }
-         else
-         {
-           motion_status = FALSE;
-           mx = ((ButtonEvent *) &event)->x;
-           my = ((ButtonEvent *) &event)->y;
-           if (event.type == EVENT_BUTTONPRESS)
-             button_status = ((ButtonEvent *) &event)->button;
+             motion_status = TRUE;
+             mx = ((MotionEvent *) &event)->x;
+             my = ((MotionEvent *) &event)->y;
+           }
            else
-             button_status = MB_RELEASED;
-         }
-
-         /* this sets 'request_gadget_id' */
-         HandleGadgets(mx, my, button_status);
-
-         switch (request_gadget_id)
-         {
-           case TOOL_CTRL_ID_YES:
-             result = TRUE;
-             break;
-           case TOOL_CTRL_ID_NO:
-             result = FALSE;
-             break;
-           case TOOL_CTRL_ID_CONFIRM:
-             result = TRUE | FALSE;
-             break;
-
-           case TOOL_CTRL_ID_PLAYER_1:
-             result = 1;
-             break;
-           case TOOL_CTRL_ID_PLAYER_2:
-             result = 2;
-             break;
-           case TOOL_CTRL_ID_PLAYER_3:
-             result = 3;
-             break;
-           case TOOL_CTRL_ID_PLAYER_4:
-             result = 4;
-             break;
-
-           default:
-             break;
+           {
+             motion_status = FALSE;
+             mx = ((ButtonEvent *) &event)->x;
+             my = ((ButtonEvent *) &event)->y;
+             if (event.type == EVENT_BUTTONPRESS)
+               button_status = ((ButtonEvent *) &event)->button;
+             else
+               button_status = MB_RELEASED;
+           }
+
+           /* this sets 'request_gadget_id' */
+           HandleGadgets(mx, my, button_status);
+
+           switch (request_gadget_id)
+           {
+             case TOOL_CTRL_ID_YES:
+               result = TRUE;
+               break;
+             case TOOL_CTRL_ID_NO:
+               result = FALSE;
+               break;
+             case TOOL_CTRL_ID_CONFIRM:
+               result = TRUE | FALSE;
+               break;
+
+             case TOOL_CTRL_ID_PLAYER_1:
+               result = 1;
+               break;
+             case TOOL_CTRL_ID_PLAYER_2:
+               result = 2;
+               break;
+             case TOOL_CTRL_ID_PLAYER_3:
+               result = 3;
+               break;
+             case TOOL_CTRL_ID_PLAYER_4:
+               result = 4;
+               break;
+
+             default:
+               break;
+           }
+
+           break;
          }
 
-         break;
-       }
+         case EVENT_KEYPRESS:
+           switch (GetEventKey((KeyEvent *)&event, TRUE))
+           {
+             case KSYM_space:
+               if (req_state & REQ_CONFIRM)
+                 result = 1;
+               break;
 
-       case EVENT_KEYPRESS:
-         switch (GetEventKey((KeyEvent *)&event, TRUE))
-         {
-           case KSYM_space:
-             if (req_state & REQ_CONFIRM)
+             case KSYM_Return:
+#if defined(TARGET_SDL2)
+             case KSYM_Menu:
+#endif
                result = 1;
-             break;
-
-           case KSYM_Return:
-             result = 1;
-             break;
+               break;
 
-           case KSYM_Escape:
+             case KSYM_Escape:
 #if defined(TARGET_SDL2)
-           case KSYM_Back:
+             case KSYM_Back:
 #endif
-             result = 0;
-             break;
+               result = 0;
+               break;
 
-           default:
-             break;
-         }
+             default:
+               break;
+           }
 
-         if (req_state & REQ_PLAYER)
-           result = 0;
-         break;
+           if (req_state & REQ_PLAYER)
+             result = 0;
+           break;
 
-       case EVENT_KEYRELEASE:
-         ClearPlayerAction();
-         break;
+         case EVENT_KEYRELEASE:
+           ClearPlayerAction();
+           break;
 
-       default:
-         HandleOtherEvents(&event);
-         break;
+         default:
+           HandleOtherEvents(&event);
+           break;
+       }
       }
     }
     else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED)
@@ -4472,11 +3561,13 @@ static int RequestHandleEvents(unsigned int req_state)
        result = 0;
     }
 
-#if 1
-
-    if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd)
+    if (level_solved)
     {
-      HandleGameActions();
+      if (global.use_envelope_request)
+      {
+       /* copy back current state of pressed buttons inside request area */
+       BlitBitmap(drawto, bitmap_db_cross, sx, sy, width, height, sx, sy);
+      }
     }
     else
     {
@@ -4486,29 +3577,7 @@ static int RequestHandleEvents(unsigned int req_state)
        Delay(10);
     }
 
-#if 1
-    game_status = GAME_MODE_PSEUDO_DOOR;
-#endif
-
     BackToFront();
-
-#if 1
-    game_status = last_game_status;    /* restore current game status */
-#endif
-
-#else
-
-    DoAnimation();
-
-#if 1
-    if (!PendingEvent())       /* delay only if no pending events */
-      Delay(10);
-#else
-    /* don't eat all CPU time */
-    Delay(10);
-#endif
-
-#endif
   }
 
   return result;
@@ -4531,12 +3600,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   }
 
   if (game_status == GAME_MODE_PLAYING)
-  {
-    if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-      BlitScreenToBitmap_EM(backbuffer);
-    else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-      BlitScreenToBitmap_SP(backbuffer);
-  }
+    BlitScreenToBitmap(backbuffer);
 
   /* disable deactivated drawing when quick-loading level tape recording */
   if (tape.playing && tape.deactivate_display)
@@ -4568,9 +3632,8 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     CloseDoor(DOOR_CLOSE_1);
 
     /* save old door content */
-    BlitBitmap(bitmap_db_door, bitmap_db_door,
-              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
-              DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
+    BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
+              0 * DXSIZE, 0, DXSIZE, DYSIZE, 1 * DXSIZE, 0);
   }
 
   SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
@@ -4640,9 +3703,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   }
 
   /* copy request gadgets to door backbuffer */
-  BlitBitmap(drawto, bitmap_db_door,
-            DX, DY, DXSIZE, DYSIZE,
-            DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+  BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
 
   OpenDoor(DOOR_OPEN_1);
 
@@ -4713,17 +3774,9 @@ static boolean RequestDoor(char *text, unsigned int req_state)
 static boolean RequestEnvelope(char *text, unsigned int req_state)
 {
   int result;
-#if 0
-  int i;
-#endif
 
   if (game_status == GAME_MODE_PLAYING)
-  {
-    if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-      BlitScreenToBitmap_EM(backbuffer);
-    else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-      BlitScreenToBitmap_SP(backbuffer);
-  }
+    BlitScreenToBitmap(backbuffer);
 
   /* disable deactivated drawing when quick-loading level tape recording */
   if (tape.playing && tape.deactivate_display)
@@ -4752,74 +3805,8 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
   /* clear door drawing field */
   // DrawBackground(DX, DY, DXSIZE, DYSIZE);
 
-#if 0
-  if (global.use_envelope_request)
-  {
-    /* !!! TMP !!! */
-    FreeToolButtons();
-    CreateToolButtons();
-  }
-#endif
-
-#if 0
-#if 0
-  if (req_state & REQ_ASK)
-  {
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_YES], FALSE);
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_NO], FALSE);
-  }
-  else if (req_state & REQ_CONFIRM)
-  {
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_CONFIRM], FALSE);
-  }
-  else if (req_state & REQ_PLAYER)
-  {
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_1], FALSE);
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_2], FALSE);
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_3], FALSE);
-    MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_4], FALSE);
-  }
-#else
-  if (req_state & REQ_ASK)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
-  }
-  else if (req_state & REQ_CONFIRM)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
-  }
-  else if (req_state & REQ_PLAYER)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
-  }
-#endif
-#endif
-
   ShowEnvelopeRequest(text, req_state, ACTION_OPENING);
 
-#if 0
-  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
-  {
-    if ((req_state & REQ_ASK && (i == TOOL_CTRL_ID_YES ||
-                                i == TOOL_CTRL_ID_NO)) ||
-       (req_state & REQ_CONFIRM && i == TOOL_CTRL_ID_CONFIRM) ||
-       (req_state & REQ_PLAYER && (i == TOOL_CTRL_ID_PLAYER_1 &&
-                                   i == TOOL_CTRL_ID_PLAYER_2 &&
-                                   i == TOOL_CTRL_ID_PLAYER_3 &&
-                                   i == TOOL_CTRL_ID_PLAYER_4)))
-    {
-      int x = tool_gadget[i]->x + dDX;
-      int y = tool_gadget[i]->y + dDY;
-
-      ModifyGadget(tool_gadget[i], GDI_X, x, GDI_Y, y, GDI_END);
-    }
-  }
-#endif
-
   if (!(req_state & REQUEST_WAIT_FOR_INPUT))
   {
     if (game_status == GAME_MODE_PLAYING)
@@ -4835,11 +3822,6 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
     return FALSE;
   }
 
-#if 0
-  if (game_status != GAME_MODE_MAIN)
-    InitAnimation();
-#endif
-
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------
@@ -4887,5411 +3869,3436 @@ boolean Request(char *text, unsigned int req_state)
     return RequestDoor(text, req_state);
 }
 
-#else  // =====================================================================
-
-boolean Request(char *text, unsigned int req_state)
+static int compareDoorPartOrderInfo(const void *object1, const void *object2)
 {
-  int mx, my, ty, result = -1;
-  unsigned int old_door_state;
-  int last_game_status = game_status;  /* save current game status */
-  int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN;
-  int font_nr = FONT_TEXT_2;
-#if 0
-  int max_word_len = 0;
-#endif
-  char *text_ptr;
-  int i;
+  const struct DoorPartOrderInfo *dpo1 = (struct DoorPartOrderInfo *)object1;
+  const struct DoorPartOrderInfo *dpo2 = (struct DoorPartOrderInfo *)object2;
+  int compare_result;
 
-#if 0
-  global.use_envelope_request = 1;
-#endif
+  if (dpo1->sort_priority != dpo2->sort_priority)
+    compare_result = dpo1->sort_priority - dpo2->sort_priority;
+  else
+    compare_result = dpo1->nr - dpo2->nr;
 
-#if 1
-  if (maxWordLengthInString(text) > MAX_REQUEST_LINE_FONT1_LEN)
+  return compare_result;
+}
+
+void InitGraphicCompatibilityInfo_Doors()
+{
+  struct
   {
-    max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN;
-    font_nr = FONT_TEXT_1;
+    int door_token;
+    int part_1, part_8;
+    struct DoorInfo *door;
   }
-#else
-  for (text_ptr = text; *text_ptr; text_ptr++)
+  doors[] =
   {
-    max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0);
-
-    if (max_word_len > MAX_REQUEST_LINE_FONT1_LEN)
-    {
-      max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN;
-#if 1
-      font_nr = FONT_TEXT_1;
-#else
-      font_nr = FONT_LEVEL_NUMBER;
-#endif
-
-      break;
-    }
-  }
-#endif
+    { DOOR_1,  IMG_DOOR_1_GFX_PART_1,  IMG_DOOR_1_GFX_PART_8,  &door_1 },
+    { DOOR_2,  IMG_DOOR_2_GFX_PART_1,  IMG_DOOR_2_GFX_PART_8,  &door_2 },
 
-  if (game_status == GAME_MODE_PLAYING)
+    { -1,      -1,                     -1,                     NULL    }
+  };
+  struct Rect door_rect_list[] =
   {
-    if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-      BlitScreenToBitmap_EM(backbuffer);
-    else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-      BlitScreenToBitmap_SP(backbuffer);
-  }
+    { DX, DY, DXSIZE, DYSIZE },
+    { VX, VY, VXSIZE, VYSIZE }
+  };
+  int i, j;
 
-  /* disable deactivated drawing when quick-loading level tape recording */
-  if (tape.playing && tape.deactivate_display)
-    TapeDeactivateDisplayOff(TRUE);
+  for (i = 0; doors[i].door_token != -1; i++)
+  {
+    int door_token = doors[i].door_token;
+    int door_index = DOOR_INDEX_FROM_TOKEN(door_token);
+    int part_1 = doors[i].part_1;
+    int part_8 = doors[i].part_8;
+    int part_2 = part_1 + 1;
+    int part_3 = part_1 + 2;
+    struct DoorInfo *door = doors[i].door;
+    struct Rect *door_rect = &door_rect_list[door_index];
+    boolean door_gfx_redefined = FALSE;
 
-  SetMouseCursor(CURSOR_DEFAULT);
+    /* check if any door part graphic definitions have been redefined */
 
-#if defined(NETWORK_AVALIABLE)
-  /* pause network game while waiting for request to answer */
-  if (options.network &&
-      game_status == GAME_MODE_PLAYING &&
-      req_state & REQUEST_WAIT_FOR_INPUT)
-    SendToServer_PausePlaying();
-#endif
+    for (j = 0; door_part_controls[j].door_token != -1; j++)
+    {
+      struct DoorPartControlInfo *dpc = &door_part_controls[j];
+      struct FileInfo *fi = getImageListEntryFromImageID(dpc->graphic);
 
-  old_door_state = GetDoorState();
+      if (dpc->door_token == door_token && fi->redefined)
+       door_gfx_redefined = TRUE;
+    }
 
-  /* simulate releasing mouse button over last gadget, if still pressed */
-  if (button_status)
-    HandleGadgets(-1, -1, 0);
+    /* check for old-style door graphic/animation modifications */
 
-  UnmapAllGadgets();
+    if (!door_gfx_redefined)
+    {
+      if (door->anim_mode & ANIM_STATIC_PANEL)
+      {
+       door->panel.step_xoffset = 0;
+       door->panel.step_yoffset = 0;
+      }
 
-  /* draw released gadget before proceeding */
-  // BackToFront();
+      if (door->anim_mode & (ANIM_HORIZONTAL | ANIM_VERTICAL))
+      {
+       struct GraphicInfo *g_part_1 = &graphic_info[part_1];
+       struct GraphicInfo *g_part_2 = &graphic_info[part_2];
+       int num_door_steps, num_panel_steps;
 
-#if 0
-  if (old_door_state & DOOR_OPEN_1 && !global.use_envelope_request)
-#else
-  if (old_door_state & DOOR_OPEN_1)
-#endif
-  {
-#if 1
-    if (!global.use_envelope_request)
-      CloseDoor(DOOR_CLOSE_1);
-#else
-    CloseDoor(DOOR_CLOSE_1);
-#endif
+       /* remove door part graphics other than the two default wings */
 
-    /* save old door content */
-    BlitBitmap(bitmap_db_door, bitmap_db_door,
-              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
-              DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
-  }
+       for (j = 0; door_part_controls[j].door_token != -1; j++)
+       {
+         struct DoorPartControlInfo *dpc = &door_part_controls[j];
+         struct GraphicInfo *g = &graphic_info[dpc->graphic];
 
-#if 1
-  SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
-#endif
+         if (dpc->graphic >= part_3 &&
+             dpc->graphic <= part_8)
+           g->bitmap = NULL;
+       }
 
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+       /* set graphics and screen positions of the default wings */
 
-  /* clear door drawing field */
-  DrawBackground(DX, DY, DXSIZE, DYSIZE);
+       g_part_1->width  = door_rect->width;
+       g_part_1->height = door_rect->height;
+       g_part_2->width  = door_rect->width;
+       g_part_2->height = door_rect->height;
+       g_part_2->src_x = door_rect->width;
+       g_part_2->src_y = g_part_1->src_y;
 
-  /* force DOOR font inside door area */
-  game_status = GAME_MODE_PSEUDO_DOOR;
+       door->part_2.x = door->part_1.x;
+       door->part_2.y = door->part_1.y;
 
-  /* write text for request */
-  for (text_ptr = text, ty = 0; ty < MAX_REQUEST_LINES; ty++)
-  {
-    char text_line[max_request_line_len + 1];
-    int tx, tl, tc = 0;
+       if (door->width != -1)
+       {
+         g_part_1->width = door->width;
+         g_part_2->width = door->width;
 
-    if (!*text_ptr)
-      break;
+         // special treatment for graphics and screen position of right wing
+         g_part_2->src_x += door_rect->width - door->width;
+         door->part_2.x  += door_rect->width - door->width;
+       }
 
-    for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++)
-    {
-      tc = *(text_ptr + tx);
-      if (!tc || tc == ' ')
-       break;
-    }
+       if (door->height != -1)
+       {
+         g_part_1->height = door->height;
+         g_part_2->height = door->height;
 
-    if (!tl)
-    { 
-      text_ptr++; 
-      ty--; 
-      continue; 
-    }
+         // special treatment for graphics and screen position of bottom wing
+         g_part_2->src_y += door_rect->height - door->height;
+         door->part_2.y  += door_rect->height - door->height;
+       }
 
-    strncpy(text_line, text_ptr, tl);
-    text_line[tl] = 0;
+       /* set animation delays for the default wings and panels */
 
-    DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2,
-            DY + 8 + ty * (getFontHeight(font_nr) + 2),
-            text_line, font_nr);
+       door->part_1.step_delay = door->step_delay;
+       door->part_2.step_delay = door->step_delay;
+       door->panel.step_delay  = door->step_delay;
 
-    text_ptr += tl + (tc == ' ' ? 1 : 0);
-  }
+       /* set animation draw order for the default wings */
 
-  game_status = last_game_status;      /* restore current game status */
+       door->part_1.sort_priority = 2; /* draw left wing over ... */
+       door->part_2.sort_priority = 1; /*          ... right wing */
 
-#if 1
-  if (global.use_envelope_request)
-  {
-    /* !!! TMP !!! */
-    FreeToolButtons();
-    CreateToolButtons();
-  }
-#endif
+       /* set animation draw offset for the default wings */
 
-  if (req_state & REQ_ASK)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
-  }
-  else if (req_state & REQ_CONFIRM)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
-  }
-  else if (req_state & REQ_PLAYER)
-  {
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
-    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
-  }
+       if (door->anim_mode & ANIM_HORIZONTAL)
+       {
+         door->part_1.step_xoffset = door->step_offset;
+         door->part_1.step_yoffset = 0;
+         door->part_2.step_xoffset = door->step_offset * -1;
+         door->part_2.step_yoffset = 0;
 
-  /* copy request gadgets to door backbuffer */
-  BlitBitmap(drawto, bitmap_db_door,
-            DX, DY, DXSIZE, DYSIZE,
-            DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+         num_door_steps = g_part_1->width / door->step_offset;
+       }
+       else    // ANIM_VERTICAL
+       {
+         door->part_1.step_xoffset = 0;
+         door->part_1.step_yoffset = door->step_offset;
+         door->part_2.step_xoffset = 0;
+         door->part_2.step_yoffset = door->step_offset * -1;
 
-#if 1
-  if (global.use_envelope_request)
-  {
-    ShowEnvelopeRequest(text, ACTION_OPENING);
+         num_door_steps = g_part_1->height / door->step_offset;
+       }
 
-    for (i = 0; i < NUM_TOOL_BUTTONS; i++)
-    {
-      if ((req_state & REQ_ASK && (i == TOOL_CTRL_ID_YES ||
-                                  i == TOOL_CTRL_ID_NO)) ||
-         (req_state & REQ_CONFIRM && i == TOOL_CTRL_ID_CONFIRM) ||
-         (req_state & REQ_PLAYER && (i == TOOL_CTRL_ID_PLAYER_1 &&
-                                     i == TOOL_CTRL_ID_PLAYER_2 &&
-                                     i == TOOL_CTRL_ID_PLAYER_3 &&
-                                     i == TOOL_CTRL_ID_PLAYER_4)))
-      {
-       int x = tool_gadget[i]->x + dDX;
-       int y = tool_gadget[i]->y + dDY;
+       /* set animation draw offset for the default panels */
 
-       ModifyGadget(tool_gadget[i], GDI_X, x, GDI_Y, y, GDI_END);
+       if (door->step_offset > 1)
+       {
+         num_panel_steps = 2 * door_rect->height / door->step_offset;
+         door->panel.start_step = num_panel_steps - num_door_steps;
+         door->panel.start_step_closing = door->panel.start_step;
+       }
+       else
+       {
+         num_panel_steps = door_rect->height / door->step_offset;
+         door->panel.start_step = num_panel_steps - num_door_steps / 2;
+         door->panel.start_step_closing = door->panel.start_step;
+         door->panel.step_delay *= 2;
+       }
       }
     }
   }
-#endif
+}
 
-#if 1
-  if (!global.use_envelope_request)
-    OpenDoor(DOOR_OPEN_1);
-#else
-  OpenDoor(DOOR_OPEN_1);
-#endif
+void InitDoors()
+{
+  int i;
 
-  if (!(req_state & REQUEST_WAIT_FOR_INPUT))
+  for (i = 0; door_part_controls[i].door_token != -1; i++)
   {
-    if (game_status == GAME_MODE_PLAYING)
-    {
-      SetPanelBackground();
-      SetDrawBackgroundMask(REDRAW_DOOR_1);
-    }
-    else
+    struct DoorPartControlInfo *dpc = &door_part_controls[i];
+    struct DoorPartOrderInfo *dpo = &door_part_order[i];
+
+    /* initialize "start_step_opening" and "start_step_closing", if needed */
+    if (dpc->pos->start_step_opening == 0 &&
+       dpc->pos->start_step_closing == 0)
     {
-      SetDrawBackgroundMask(REDRAW_FIELD);
+      // dpc->pos->start_step_opening = dpc->pos->start_step;
+      dpc->pos->start_step_closing = dpc->pos->start_step;
     }
 
-    return FALSE;
+    /* fill structure for door part draw order (sorted below) */
+    dpo->nr = i;
+    dpo->sort_priority = dpc->pos->sort_priority;
   }
 
-#if 1
-  if (game_status != GAME_MODE_MAIN && !global.use_envelope_request)
-    InitAnimation();
-#else
-  if (game_status != GAME_MODE_MAIN)
-    InitAnimation();
-#endif
-
-  button_status = MB_RELEASED;
-
-  request_gadget_id = -1;
-
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+  /* sort door part controls according to sort_priority and graphic number */
+  qsort(door_part_order, MAX_DOOR_PARTS,
+        sizeof(struct DoorPartOrderInfo), compareDoorPartOrderInfo);
+}
 
-  while (result < 0)
+unsigned int OpenDoor(unsigned int door_state)
+{
+  if (door_state & DOOR_COPY_BACK)
   {
-    if (PendingEvent())
-    {
-      Event event;
+    if (door_state & DOOR_OPEN_1)
+      BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
+                1 * DXSIZE, 0, DXSIZE, DYSIZE, 0 * DXSIZE, 0);
 
-      NextEvent(&event);
+    if (door_state & DOOR_OPEN_2)
+      BlitBitmap(bitmap_db_door_2, bitmap_db_door_2,
+                1 * VXSIZE, 0, VXSIZE, VYSIZE, 0 * VXSIZE, 0);
 
-      switch (event.type)
-      {
-       case EVENT_BUTTONPRESS:
-       case EVENT_BUTTONRELEASE:
-       case EVENT_MOTIONNOTIFY:
-       {
-         if (event.type == EVENT_MOTIONNOTIFY)
-         {
-           if (!PointerInWindow(window))
-             continue; /* window and pointer are on different screens */
+    door_state &= ~DOOR_COPY_BACK;
+  }
 
-           if (!button_status)
-             continue;
+  return MoveDoor(door_state);
+}
 
-           motion_status = TRUE;
-           mx = ((MotionEvent *) &event)->x;
-           my = ((MotionEvent *) &event)->y;
-         }
-         else
-         {
-           motion_status = FALSE;
-           mx = ((ButtonEvent *) &event)->x;
-           my = ((ButtonEvent *) &event)->y;
-           if (event.type == EVENT_BUTTONPRESS)
-             button_status = ((ButtonEvent *) &event)->button;
-           else
-             button_status = MB_RELEASED;
-         }
+unsigned int CloseDoor(unsigned int door_state)
+{
+  unsigned int old_door_state = GetDoorState();
 
-         /* this sets 'request_gadget_id' */
-         HandleGadgets(mx, my, button_status);
+  if (!(door_state & DOOR_NO_COPY_BACK))
+  {
+    if (old_door_state & DOOR_OPEN_1)
+      BlitBitmap(backbuffer, bitmap_db_door_1,
+                DX, DY, DXSIZE, DYSIZE, 0, 0);
 
-         switch (request_gadget_id)
-         {
-           case TOOL_CTRL_ID_YES:
-             result = TRUE;
-             break;
-           case TOOL_CTRL_ID_NO:
-             result = FALSE;
-             break;
-           case TOOL_CTRL_ID_CONFIRM:
-             result = TRUE | FALSE;
-             break;
-
-           case TOOL_CTRL_ID_PLAYER_1:
-             result = 1;
-             break;
-           case TOOL_CTRL_ID_PLAYER_2:
-             result = 2;
-             break;
-           case TOOL_CTRL_ID_PLAYER_3:
-             result = 3;
-             break;
-           case TOOL_CTRL_ID_PLAYER_4:
-             result = 4;
-             break;
-
-           default:
-             break;
-         }
+    if (old_door_state & DOOR_OPEN_2)
+      BlitBitmap(backbuffer, bitmap_db_door_2,
+                VX, VY, VXSIZE, VYSIZE, 0, 0);
 
-         break;
-       }
+    door_state &= ~DOOR_NO_COPY_BACK;
+  }
 
-       case EVENT_KEYPRESS:
-         switch (GetEventKey((KeyEvent *)&event, TRUE))
-         {
-           case KSYM_space:
-             if (req_state & REQ_CONFIRM)
-               result = 1;
-             break;
+  return MoveDoor(door_state);
+}
 
-           case KSYM_Return:
-             result = 1;
-             break;
+unsigned int GetDoorState()
+{
+  return MoveDoor(DOOR_GET_STATE);
+}
 
-           case KSYM_Escape:
-#if defined(TARGET_SDL2)
-           case KSYM_Back:
-#endif
-             result = 0;
-             break;
+unsigned int SetDoorState(unsigned int door_state)
+{
+  return MoveDoor(door_state | DOOR_SET_STATE);
+}
 
-           default:
-             break;
-         }
+int euclid(int a, int b)
+{
+  return (b ? euclid(b, a % b) : a);
+}
 
-         if (req_state & REQ_PLAYER)
-           result = 0;
-         break;
+unsigned int MoveDoor(unsigned int door_state)
+{
+  struct Rect door_rect_list[] =
+  {
+    { DX, DY, DXSIZE, DYSIZE },
+    { VX, VY, VXSIZE, VYSIZE }
+  };
+  static int door1 = DOOR_OPEN_1;
+  static int door2 = DOOR_CLOSE_2;
+  unsigned int door_delay = 0;
+  unsigned int door_delay_value;
+  int i;
 
-       case EVENT_KEYRELEASE:
-         ClearPlayerAction();
-         break;
+  if (door_state == DOOR_GET_STATE)
+    return (door1 | door2);
 
-       default:
-         HandleOtherEvents(&event);
-         break;
-      }
-    }
-    else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED)
-    {
-      int joy = AnyJoystick();
+  if (door_state & DOOR_SET_STATE)
+  {
+    if (door_state & DOOR_ACTION_1)
+      door1 = door_state & DOOR_ACTION_1;
+    if (door_state & DOOR_ACTION_2)
+      door2 = door_state & DOOR_ACTION_2;
 
-      if (joy & JOY_BUTTON_1)
-       result = 1;
-      else if (joy & JOY_BUTTON_2)
-       result = 0;
-    }
-
-#if 1
+    return (door1 | door2);
+  }
 
-    if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd)
-    {
-      HandleGameActions();
-    }
-    else
-    {
-      DoAnimation();
+  if (!(door_state & DOOR_FORCE_REDRAW))
+  {
+    if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1)
+      door_state &= ~DOOR_OPEN_1;
+    else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1)
+      door_state &= ~DOOR_CLOSE_1;
+    if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2)
+      door_state &= ~DOOR_OPEN_2;
+    else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
+      door_state &= ~DOOR_CLOSE_2;
+  }
 
-      if (!PendingEvent())     /* delay only if no pending events */
-       Delay(10);
-    }
+  if (global.autoplay_leveldir)
+  {
+    door_state |= DOOR_NO_DELAY;
+    door_state &= ~DOOR_CLOSE_ALL;
+  }
 
-#if 1
-    game_status = GAME_MODE_PSEUDO_DOOR;
-#endif
+  if (game_status == GAME_MODE_EDITOR)
+    door_state |= DOOR_NO_DELAY;
 
-    BackToFront();
+  if (door_state & DOOR_ACTION)
+  {
+    boolean door_panel_drawn[NUM_DOORS];
+    boolean panel_has_doors[NUM_DOORS];
+    boolean door_part_skip[MAX_DOOR_PARTS];
+    boolean door_part_done[MAX_DOOR_PARTS];
+    boolean door_part_done_all;
+    int num_steps[MAX_DOOR_PARTS];
+    int max_move_delay = 0;    // delay for complete animations of all doors
+    int max_step_delay = 0;    // delay (ms) between two animation frames
+    int num_move_steps = 0;    // number of animation steps for all doors
+    int max_move_delay_doors_only = 0; // delay for doors only (no panel)
+    int num_move_steps_doors_only = 0; // steps for doors only (no panel)
+    int current_move_delay = 0;
+    int start = 0;
+    int k;
 
-#if 1
-    game_status = last_game_status;    /* restore current game status */
-#endif
+    for (i = 0; i < NUM_DOORS; i++)
+      panel_has_doors[i] = FALSE;
 
-#else
+    for (i = 0; i < MAX_DOOR_PARTS; i++)
+    {
+      struct DoorPartControlInfo *dpc = &door_part_controls[i];
+      struct GraphicInfo *g = &graphic_info[dpc->graphic];
+      int door_token = dpc->door_token;
 
-    DoAnimation();
+      door_part_done[i] = FALSE;
+      door_part_skip[i] = (!(door_state & door_token) ||
+                          !g->bitmap);
+    }
 
-#if 1
-    if (!PendingEvent())       /* delay only if no pending events */
-      Delay(10);
-#else
-    /* don't eat all CPU time */
-    Delay(10);
-#endif
+    for (i = 0; i < MAX_DOOR_PARTS; i++)
+    {
+      int nr = door_part_order[i].nr;
+      struct DoorPartControlInfo *dpc = &door_part_controls[nr];
+      struct DoorPartPosInfo *pos = dpc->pos;
+      struct GraphicInfo *g = &graphic_info[dpc->graphic];
+      int door_token = dpc->door_token;
+      int door_index = DOOR_INDEX_FROM_TOKEN(door_token);
+      boolean is_panel = DOOR_PART_IS_PANEL(nr);
+      int step_xoffset = ABS(pos->step_xoffset);
+      int step_yoffset = ABS(pos->step_yoffset);
+      int step_delay = pos->step_delay;
+      int current_door_state = door_state & door_token;
+      boolean door_opening = ((current_door_state & DOOR_OPEN)  != 0);
+      boolean door_closing = ((current_door_state & DOOR_CLOSE) != 0);
+      boolean part_opening = (is_panel ? door_closing : door_opening);
+      int start_step = (part_opening ? pos->start_step_opening :
+                       pos->start_step_closing);
+      float move_xsize = (step_xoffset ? g->width  : 0);
+      float move_ysize = (step_yoffset ? g->height : 0);
+      int move_xsteps = (step_xoffset ? ceil(move_xsize / step_xoffset) : 0);
+      int move_ysteps = (step_yoffset ? ceil(move_ysize / step_yoffset) : 0);
+      int move_steps = (move_xsteps && move_ysteps ?
+                       MIN(move_xsteps, move_ysteps) :
+                       move_xsteps ? move_xsteps : move_ysteps) - start_step;
+      int move_delay = move_steps * step_delay;
 
-#endif
-  }
+      if (door_part_skip[nr])
+       continue;
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
+      max_move_delay = MAX(max_move_delay, move_delay);
+      max_step_delay = (max_step_delay == 0 ? step_delay :
+                       euclid(max_step_delay, step_delay));
+      num_steps[nr] = move_steps;
 
-  UnmapToolButtons();
+      if (!is_panel)
+      {
+       max_move_delay_doors_only = MAX(max_move_delay_doors_only, move_delay);
 
-#if 1
-  if (global.use_envelope_request)
-    ShowEnvelopeRequest(text, ACTION_CLOSING);
-#endif
+       panel_has_doors[door_index] = TRUE;
+      }
+    }
 
-#if 1
-  if (!(req_state & REQ_STAY_OPEN) && !global.use_envelope_request)
-#else
-  if (!(req_state & REQ_STAY_OPEN))
-#endif
-  {
-    CloseDoor(DOOR_CLOSE_1);
+    max_step_delay = MAX(1, max_step_delay);   // prevent division by zero
 
-    if (((old_door_state & DOOR_OPEN_1) && !(req_state & REQ_STAY_CLOSED)) ||
-       (req_state & REQ_REOPEN))
-      OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
-  }
+    num_move_steps = max_move_delay / max_step_delay;
+    num_move_steps_doors_only = max_move_delay_doors_only / max_step_delay;
 
-  RemapAllGadgets();
+    door_delay_value = max_step_delay;
 
-  if (game_status == GAME_MODE_PLAYING)
-  {
-    SetPanelBackground();
-    SetDrawBackgroundMask(REDRAW_DOOR_1);
-  }
-  else
-  {
-    SetDrawBackgroundMask(REDRAW_FIELD);
-  }
+    if ((door_state & DOOR_NO_DELAY) || setup.quick_doors)
+    {
+      start = num_move_steps - 1;
+    }
+    else
+    {
+      /* opening door sound has priority over simultaneously closing door */
+      if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
+        PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
+      else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
+        PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
+    }
 
-#if defined(NETWORK_AVALIABLE)
-  /* continue network game after request */
-  if (options.network &&
-      game_status == GAME_MODE_PLAYING &&
-      req_state & REQUEST_WAIT_FOR_INPUT)
-    SendToServer_ContinuePlaying();
-#endif
+    for (k = start; k < num_move_steps; k++)
+    {
+      int last_frame = num_move_steps - 1;     // last frame of this "for" loop
 
-  /* restore deactivated drawing when quick-loading level tape recording */
-  if (tape.playing && tape.deactivate_display)
-    TapeDeactivateDisplayOn();
+      door_part_done_all = TRUE;
 
-  return result;
-}
+      for (i = 0; i < NUM_DOORS; i++)
+       door_panel_drawn[i] = FALSE;
 
-#endif
+      for (i = 0; i < MAX_DOOR_PARTS; i++)
+      {
+       int nr = door_part_order[i].nr;
+       struct DoorPartControlInfo *dpc = &door_part_controls[nr];
+       struct DoorPartPosInfo *pos = dpc->pos;
+       struct GraphicInfo *g = &graphic_info[dpc->graphic];
+       int door_token = dpc->door_token;
+       int door_index = DOOR_INDEX_FROM_TOKEN(door_token);
+       boolean is_panel = DOOR_PART_IS_PANEL(nr);
+       boolean is_panel_and_door_has_closed = FALSE;
+       struct Rect *door_rect = &door_rect_list[door_index];
+       Bitmap *bitmap_db_door = (door_token == DOOR_1 ? bitmap_db_door_1 :
+                                 bitmap_db_door_2);
+       Bitmap *bitmap = (is_panel ? bitmap_db_door : g->bitmap);
+       int current_door_state = door_state & door_token;
+       boolean door_opening = ((current_door_state & DOOR_OPEN)  != 0);
+       boolean door_closing = !door_opening;
+       boolean part_opening = (is_panel ? door_closing : door_opening);
+       boolean part_closing = !part_opening;
+       int start_step = (part_opening ? pos->start_step_opening :
+                         pos->start_step_closing);
+       int step_delay = pos->step_delay;
+       int step_factor = step_delay / max_step_delay;
+       int k1 = (step_factor ? k / step_factor + 1 : k);
+       int k2 = (part_opening ? k1 + start_step : num_steps[nr] - k1);
+       int kk = MAX(0, k2);
+       int g_src_x = 0;
+       int g_src_y = 0;
+       int src_x, src_y, src_xx, src_yy;
+       int dst_x, dst_y, dst_xx, dst_yy;
+       int width, height;
 
-static int compareDoorPartOrderInfo(const void *object1, const void *object2)
-{
-  const struct DoorPartOrderInfo *dpo1 = (struct DoorPartOrderInfo *)object1;
-  const struct DoorPartOrderInfo *dpo2 = (struct DoorPartOrderInfo *)object2;
-  int compare_result;
+       if (door_part_skip[nr])
+         continue;
 
-  if (dpo1->sort_priority != dpo2->sort_priority)
-    compare_result = dpo1->sort_priority - dpo2->sort_priority;
-  else
-    compare_result = dpo1->nr - dpo2->nr;
+       if (!(door_state & door_token))
+         continue;
 
-  return compare_result;
-}
+       if (!g->bitmap)
+         continue;
 
-void InitGraphicCompatibilityInfo_Doors()
-{
-  struct
-  {
-    int door_token;
-    int part_1, part_8;
-    struct DoorInfo *door;
-  }
-  doors[] =
-  {
-    { DOOR_1,  IMG_DOOR_1_GFX_PART_1,  IMG_DOOR_1_GFX_PART_8,  &door_1 },
-    { DOOR_2,  IMG_DOOR_2_GFX_PART_1,  IMG_DOOR_2_GFX_PART_8,  &door_2 },
+       if (!is_panel)
+       {
+         int k2_door = (door_opening ? k : num_move_steps_doors_only - k - 1);
+         int kk_door = MAX(0, k2_door);
+         int sync_frame = kk_door * door_delay_value;
+         int frame = getGraphicAnimationFrame(dpc->graphic, sync_frame);
 
-    { -1,      -1,                     -1,                     NULL    }
-  };
-  struct Rect door_rect_list[] =
-  {
-    { DX, DY, DXSIZE, DYSIZE },
-    { VX, VY, VXSIZE, VYSIZE }
-  };
-  int i, j;
+         getGraphicSource(dpc->graphic, frame, &bitmap, &g_src_x, &g_src_y);
+       }
 
-  for (i = 0; doors[i].door_token != -1; i++)
-  {
-    int door_token = doors[i].door_token;
-    int door_index = DOOR_INDEX_FROM_TOKEN(door_token);
-    int part_1 = doors[i].part_1;
-    int part_8 = doors[i].part_8;
-    int part_2 = part_1 + 1;
-    int part_3 = part_1 + 2;
-    struct DoorInfo *door = doors[i].door;
-    struct Rect *door_rect = &door_rect_list[door_index];
-    boolean door_gfx_redefined = FALSE;
+       // draw door panel
 
-    /* check if any door part graphic definitions have been redefined */
+       if (!door_panel_drawn[door_index])
+       {
+         ClearRectangle(drawto, door_rect->x, door_rect->y,
+                        door_rect->width, door_rect->height);
 
-    for (j = 0; door_part_controls[j].door_token != -1; j++)
-    {
-      struct DoorPartControlInfo *dpc = &door_part_controls[j];
-      struct FileInfo *fi = getImageListEntryFromImageID(dpc->graphic);
+         door_panel_drawn[door_index] = TRUE;
+       }
 
-      if (dpc->door_token == door_token && fi->redefined)
-       door_gfx_redefined = TRUE;
-    }
+       // draw opening or closing door parts
 
-    /* check for old-style door graphic/animation modifications */
+       if (pos->step_xoffset < 0)      // door part on right side
+       {
+         src_xx = 0;
+         dst_xx = pos->x + ABS(kk * pos->step_xoffset);
+         width = g->width;
 
-    if (!door_gfx_redefined)
-    {
-      if (door->anim_mode & ANIM_STATIC_PANEL)
-      {
-       door->panel.step_xoffset = 0;
-       door->panel.step_yoffset = 0;
-      }
-
-      if (door->anim_mode & (ANIM_HORIZONTAL | ANIM_VERTICAL))
-      {
-       struct GraphicInfo *g_part_1 = &graphic_info[part_1];
-       struct GraphicInfo *g_part_2 = &graphic_info[part_2];
-       int num_door_steps, num_panel_steps;
-
-       /* remove door part graphics other than the two default wings */
-
-       for (j = 0; door_part_controls[j].door_token != -1; j++)
-       {
-         struct DoorPartControlInfo *dpc = &door_part_controls[j];
-         struct GraphicInfo *g = &graphic_info[dpc->graphic];
-
-         if (dpc->graphic >= part_3 &&
-             dpc->graphic <= part_8)
-           g->bitmap = NULL;
+         if (dst_xx + width > door_rect->width)
+           width = door_rect->width - dst_xx;
        }
+       else                            // door part on left side
+       {
+         src_xx = 0;
+         dst_xx = pos->x - kk * pos->step_xoffset;
 
-       /* set graphics and screen positions of the default wings */
-
-       g_part_1->width  = door_rect->width;
-       g_part_1->height = door_rect->height;
-       g_part_2->width  = door_rect->width;
-       g_part_2->height = door_rect->height;
-       g_part_2->src_x = door_rect->width;
-       g_part_2->src_y = g_part_1->src_y;
+         if (dst_xx < 0)
+         {
+           src_xx = ABS(dst_xx);
+           dst_xx = 0;
+         }
 
-       door->part_2.x = door->part_1.x;
-       door->part_2.y = door->part_1.y;
+         width = g->width - src_xx;
 
-       if (door->width != -1)
-       {
-         g_part_1->width = door->width;
-         g_part_2->width = door->width;
+         if (width > door_rect->width)
+           width = door_rect->width;
 
-         // special treatment for graphics and screen position of right wing
-         g_part_2->src_x += door_rect->width - door->width;
-         door->part_2.x  += door_rect->width - door->width;
+         // printf("::: k == %d [%d] \n", k, start_step);
        }
 
-       if (door->height != -1)
+       if (pos->step_yoffset < 0)      // door part on bottom side
        {
-         g_part_1->height = door->height;
-         g_part_2->height = door->height;
+         src_yy = 0;
+         dst_yy = pos->y + ABS(kk * pos->step_yoffset);
+         height = g->height;
 
-         // special treatment for graphics and screen position of bottom wing
-         g_part_2->src_y += door_rect->height - door->height;
-         door->part_2.y  += door_rect->height - door->height;
+         if (dst_yy + height > door_rect->height)
+           height = door_rect->height - dst_yy;
        }
+       else                            // door part on top side
+       {
+         src_yy = 0;
+         dst_yy = pos->y - kk * pos->step_yoffset;
 
-       /* set animation delays for the default wings and panels */
+         if (dst_yy < 0)
+         {
+           src_yy = ABS(dst_yy);
+           dst_yy = 0;
+         }
 
-       door->part_1.step_delay = door->step_delay;
-       door->part_2.step_delay = door->step_delay;
-       door->panel.step_delay  = door->step_delay;
+         height = g->height - src_yy;
+       }
 
-       /* set animation draw order for the default wings */
+       src_x = g_src_x + src_xx;
+       src_y = g_src_y + src_yy;
 
-       door->part_1.sort_priority = 2; /* draw left wing over ... */
-       door->part_2.sort_priority = 1; /*          ... right wing */
+       dst_x = door_rect->x + dst_xx;
+       dst_y = door_rect->y + dst_yy;
 
-       /* set animation draw offset for the default wings */
+       is_panel_and_door_has_closed =
+         (is_panel &&
+          door_closing &&
+          panel_has_doors[door_index] &&
+          k >= num_move_steps_doors_only - 1);
 
-       if (door->anim_mode & ANIM_HORIZONTAL)
+       if (width  >= 0 && width  <= g->width &&
+           height >= 0 && height <= g->height &&
+           !is_panel_and_door_has_closed)
        {
-         door->part_1.step_xoffset = door->step_offset;
-         door->part_1.step_yoffset = 0;
-         door->part_2.step_xoffset = door->step_offset * -1;
-         door->part_2.step_yoffset = 0;
-
-         num_door_steps = g_part_1->width / door->step_offset;
+         if (is_panel || !pos->draw_masked)
+           BlitBitmap(bitmap, drawto, src_x, src_y, width, height,
+                      dst_x, dst_y);
+         else
+           BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height,
+                            dst_x, dst_y);
        }
-       else    // ANIM_VERTICAL
-       {
-         door->part_1.step_xoffset = 0;
-         door->part_1.step_yoffset = door->step_offset;
-         door->part_2.step_xoffset = 0;
-         door->part_2.step_yoffset = door->step_offset * -1;
 
-         num_door_steps = g_part_1->height / door->step_offset;
-       }
+       redraw_mask |= REDRAW_DOOR_FROM_TOKEN(door_token);
 
-       /* set animation draw offset for the default panels */
+       if ((part_opening && (width < 0         || height < 0)) ||
+           (part_closing && (width >= g->width && height >= g->height)))
+         door_part_done[nr] = TRUE;
 
-       if (door->step_offset > 1)
-       {
-         num_panel_steps = 2 * door_rect->height / door->step_offset;
-         door->panel.start_step = num_panel_steps - num_door_steps;
-       }
-       else
-       {
-         num_panel_steps = door_rect->height / door->step_offset;
-         door->panel.start_step = num_panel_steps - num_door_steps / 2;
-         door->panel.step_delay *= 2;
-       }
+       // continue door part animations, but not panel after door has closed
+       if (!door_part_done[nr] && !is_panel_and_door_has_closed)
+         door_part_done_all = FALSE;
       }
-    }
-  }
-}
 
-void InitDoors()
-{
-  int i;
-
-  for (i = 0; door_part_controls[i].door_token != -1; i++)
-  {
-    struct DoorPartControlInfo *dpc = &door_part_controls[i];
-    struct DoorPartOrderInfo *dpo = &door_part_order[i];
+      if (!(door_state & DOOR_NO_DELAY))
+      {
+       BackToFront();
 
-    /* initialize "start_step_opening" and "start_step_closing", if needed */
-    if (dpc->pos->start_step_opening == 0 &&
-       dpc->pos->start_step_closing == 0)
-    {
-      // dpc->pos->start_step_opening = dpc->pos->start_step;
-      dpc->pos->start_step_closing = dpc->pos->start_step;
-    }
+       if (game_status == GAME_MODE_MAIN)
+         DoAnimation();
 
-    /* fill structure for door part draw order (sorted below) */
-    dpo->nr = i;
-    dpo->sort_priority = dpc->pos->sort_priority;
+       SkipUntilDelayReached(&door_delay, door_delay_value, &k, last_frame);
 
-#if 0
-    struct DoorPartPosInfo *pos = dpc->pos;
+       current_move_delay += max_step_delay;
+      }
 
-    printf(":0: step_xoffset == %d, step_yoffset == %d\n",
-          pos->step_xoffset, pos->step_yoffset);
-#endif
+      if (door_part_done_all)
+       break;
+    }
   }
 
-  /* sort door part controls according to sort_priority and graphic number */
-  qsort(door_part_order, MAX_DOOR_PARTS,
-        sizeof(struct DoorPartOrderInfo), compareDoorPartOrderInfo);
+  if (door_state & DOOR_ACTION_1)
+    door1 = door_state & DOOR_ACTION_1;
+  if (door_state & DOOR_ACTION_2)
+    door2 = door_state & DOOR_ACTION_2;
+
+  return (door1 | door2);
 }
 
-unsigned int OpenDoor(unsigned int door_state)
+static boolean useSpecialEditorDoor()
 {
-  if (door_state & DOOR_COPY_BACK)
-  {
-    if (door_state & DOOR_OPEN_1)
-      BlitBitmap(bitmap_db_door, bitmap_db_door,
-                DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
-                DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+  int graphic = IMG_GLOBAL_BORDER_EDITOR;
+  boolean redefined = getImageListEntryFromImageID(graphic)->redefined;
 
-    if (door_state & DOOR_OPEN_2)
-      BlitBitmap(bitmap_db_door, bitmap_db_door,
-                DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY2, VXSIZE, VYSIZE,
-                DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
+  // do not draw special editor door if editor border defined or redefined
+  if (graphic_info[graphic].bitmap != NULL || redefined)
+    return FALSE;
 
-    door_state &= ~DOOR_COPY_BACK;
-  }
+  // do not draw special editor door if global border defined to be empty
+  if (graphic_info[IMG_GLOBAL_BORDER].bitmap == NULL)
+    return FALSE;
 
-  return MoveDoor(door_state);
+  // do not draw special editor door if viewport definitions do not match
+  if (EX != VX ||
+      EY >= VY ||
+      EXSIZE != VXSIZE ||
+      EY + EYSIZE != VY + VYSIZE)
+    return FALSE;
+
+  return TRUE;
 }
 
-unsigned int CloseDoor(unsigned int door_state)
+void DrawSpecialEditorDoor()
 {
-  unsigned int old_door_state = GetDoorState();
-
-  if (!(door_state & DOOR_NO_COPY_BACK))
-  {
-    if (old_door_state & DOOR_OPEN_1)
-      BlitBitmap(backbuffer, bitmap_db_door,
-                DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+  struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
+  int top_border_width = gfx1->width;
+  int top_border_height = gfx1->height;
+  int outer_border = viewport.door_2[GAME_MODE_EDITOR].border_size;
+  int ex = EX - outer_border;
+  int ey = EY - outer_border;
+  int vy = VY - outer_border;
+  int exsize = EXSIZE + 2 * outer_border;
 
-    if (old_door_state & DOOR_OPEN_2)
-      BlitBitmap(backbuffer, bitmap_db_door,
-                VX, VY, VXSIZE, VYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
+  if (!useSpecialEditorDoor())
+    return;
 
-    door_state &= ~DOOR_NO_COPY_BACK;
-  }
+  /* draw bigger level editor toolbox window */
+  BlitBitmap(gfx1->bitmap, drawto, gfx1->src_x, gfx1->src_y,
+            top_border_width, top_border_height, ex, ey - top_border_height);
+  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, ex, vy,
+            exsize, EYSIZE - VYSIZE + outer_border, ex, ey);
 
-  return MoveDoor(door_state);
+  redraw_mask |= REDRAW_ALL;
 }
 
-unsigned int GetDoorState()
+void UndrawSpecialEditorDoor()
 {
-  return MoveDoor(DOOR_GET_STATE);
-}
+  struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
+  int top_border_width = gfx1->width;
+  int top_border_height = gfx1->height;
+  int outer_border = viewport.door_2[GAME_MODE_EDITOR].border_size;
+  int ex = EX - outer_border;
+  int ey = EY - outer_border;
+  int ey_top = ey - top_border_height;
+  int exsize = EXSIZE + 2 * outer_border;
+  int eysize = EYSIZE + 2 * outer_border;
 
-unsigned int SetDoorState(unsigned int door_state)
-{
-  return MoveDoor(door_state | DOOR_SET_STATE);
+  if (!useSpecialEditorDoor())
+    return;
+
+  /* draw normal tape recorder window */
+  if (graphic_info[IMG_GLOBAL_BORDER].bitmap)
+  {
+    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
+              ex, ey_top, top_border_width, top_border_height,
+              ex, ey_top);
+    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
+              ex, ey, exsize, eysize, ex, ey);
+  }
+  else
+  {
+    // if screen background is set to "[NONE]", clear editor toolbox window
+    ClearRectangle(drawto, ex, ey_top, top_border_width, top_border_height);
+    ClearRectangle(drawto, ex, ey, exsize, eysize);
+  }
+
+  redraw_mask |= REDRAW_ALL;
 }
 
-#if 1
 
-// ========== TEST 1 ===========================================================
+/* ---------- new tool button stuff ---------------------------------------- */
 
-int euclid(int a, int b)
+static struct
 {
-  return (b ? euclid(b, a % b) : a);
-}
-
-unsigned int MoveDoor(unsigned int door_state)
+  int graphic;
+  struct TextPosInfo *pos;
+  int gadget_id;
+  char *infotext;
+} toolbutton_info[NUM_TOOL_BUTTONS] =
 {
-  struct XY panel_pos_list[] =
-  {
-    { DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 },
-    { DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 },
-  };
-  struct Rect door_rect_list[] =
   {
-    { DX, DY, DXSIZE, DYSIZE },
-    { VX, VY, VXSIZE, VYSIZE }
-  };
-  static int door1 = DOOR_OPEN_1;
-  static int door2 = DOOR_CLOSE_2;
-  unsigned int door_delay = 0;
-  unsigned int door_delay_value;
-  int i;
-
-#if 1
-  if (door_1.width < 0 || door_1.width > DXSIZE)
-    door_1.width = DXSIZE;
-  if (door_1.height < 0 || door_1.height > DYSIZE)
-    door_1.height = DYSIZE;
-  if (door_2.width < 0 || door_2.width > VXSIZE)
-    door_2.width = VXSIZE;
-  if (door_2.height < 0 || door_2.height > VYSIZE)
-    door_2.height = VYSIZE;
-#endif
-
-  if (door_state == DOOR_GET_STATE)
-    return (door1 | door2);
-
-  if (door_state & DOOR_SET_STATE)
+    IMG_REQUEST_BUTTON_GFX_YES,                &request.button.yes,
+    TOOL_CTRL_ID_YES,                  "yes"
+  },
   {
-    if (door_state & DOOR_ACTION_1)
-      door1 = door_state & DOOR_ACTION_1;
-    if (door_state & DOOR_ACTION_2)
-      door2 = door_state & DOOR_ACTION_2;
-
-    return (door1 | door2);
-  }
-
-  if (!(door_state & DOOR_FORCE_REDRAW))
+    IMG_REQUEST_BUTTON_GFX_NO,         &request.button.no,
+    TOOL_CTRL_ID_NO,                   "no"
+  },
   {
-    if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1)
-      door_state &= ~DOOR_OPEN_1;
-    else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1)
-      door_state &= ~DOOR_CLOSE_1;
-    if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2)
-      door_state &= ~DOOR_OPEN_2;
-    else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
-      door_state &= ~DOOR_CLOSE_2;
-  }
-
-#if 0
-  door_delay_value = (door_state & DOOR_ACTION_1 ? door_1.step_delay :
-                     door_2.step_delay);
-
-  if (setup.quick_doors)
+    IMG_REQUEST_BUTTON_GFX_CONFIRM,    &request.button.confirm,
+    TOOL_CTRL_ID_CONFIRM,              "confirm"
+  },
   {
-    stepsize = 20;             /* must be chosen to always draw last frame */
-    door_delay_value = 0;
-  }
-#endif
-
-  if (global.autoplay_leveldir)
+    IMG_REQUEST_BUTTON_GFX_PLAYER_1,   &request.button.player_1,
+    TOOL_CTRL_ID_PLAYER_1,             "player 1"
+  },
   {
-    door_state |= DOOR_NO_DELAY;
-    door_state &= ~DOOR_CLOSE_ALL;
+    IMG_REQUEST_BUTTON_GFX_PLAYER_2,   &request.button.player_2,
+    TOOL_CTRL_ID_PLAYER_2,             "player 2"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_PLAYER_3,   &request.button.player_3,
+    TOOL_CTRL_ID_PLAYER_3,             "player 3"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_PLAYER_4,   &request.button.player_4,
+    TOOL_CTRL_ID_PLAYER_4,             "player 4"
   }
+};
 
-#if 1
-  if (game_status == GAME_MODE_EDITOR)
-    door_state |= DOOR_NO_DELAY;
-#endif
+void CreateToolButtons()
+{
+  int i;
 
-  if (door_state & DOOR_ACTION)
+  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
   {
-    boolean door_panel_drawn[NUM_DOORS];
-    boolean door_part_skip[MAX_DOOR_PARTS];
-    boolean door_part_done[MAX_DOOR_PARTS];
-    boolean door_part_done_all;
-    int num_steps[MAX_DOOR_PARTS];
-    int max_move_delay = 0;    // delay for complete animations of all doors
-    int max_step_delay = 0;    // delay (ms) between two animation frames
-    int num_move_steps = 0;    // number of animation steps for all doors
-    int current_move_delay = 0;
-    int k;
-
-    for (i = 0; i < MAX_DOOR_PARTS; i++)
-    {
-      struct DoorPartControlInfo *dpc = &door_part_controls[i];
-      struct GraphicInfo *g = &graphic_info[dpc->graphic];
-      int door_token = dpc->door_token;
+    struct GraphicInfo *gfx = &graphic_info[toolbutton_info[i].graphic];
+    struct TextPosInfo *pos = toolbutton_info[i].pos;
+    struct GadgetInfo *gi;
+    Bitmap *deco_bitmap = None;
+    int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
+    unsigned int event_mask = GD_EVENT_RELEASED;
+    int dx = DX;
+    int dy = DY;
+    int gd_x = gfx->src_x;
+    int gd_y = gfx->src_y;
+    int gd_xp = gfx->src_x + gfx->pressed_xoffset;
+    int gd_yp = gfx->src_y + gfx->pressed_yoffset;
+    int id = i;
 
-      door_part_done[i] = FALSE;
-      door_part_skip[i] = (!(door_state & door_token) ||
-                          !g->bitmap);
-    }
+    if (global.use_envelope_request)
+      setRequestPosition(&dx, &dy, TRUE);
 
-#if 0
-    for (i = 0; i < MAX_DOOR_PARTS; i++)
+    if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
     {
-      struct DoorPartControlInfo *dpc = &door_part_controls[i];
-      struct DoorPartPosInfo *pos = dpc->pos;
-      int start_step = pos->start_step;
+      int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
 
-      printf("::: ---> %d: start_step == %d [%d]\n",
-            i, start_step, door_part_done[i]);
+      getSizedGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0,
+                           pos->size, &deco_bitmap, &deco_x, &deco_y);
+      deco_xpos = (gfx->width  - pos->size) / 2;
+      deco_ypos = (gfx->height - pos->size) / 2;
     }
-#endif
 
-    for (i = 0; i < MAX_DOOR_PARTS; i++)
-    {
-      int nr = door_part_order[i].nr;
-      struct DoorPartControlInfo *dpc = &door_part_controls[nr];
-      struct DoorPartPosInfo *pos = dpc->pos;
-      struct GraphicInfo *g = &graphic_info[dpc->graphic];
-      int door_token = dpc->door_token;
-      boolean is_panel = DOOR_PART_IS_PANEL(nr);
-      int step_xoffset = ABS(pos->step_xoffset);
-      int step_yoffset = ABS(pos->step_yoffset);
-      int step_delay = pos->step_delay;
-      int current_door_state = door_state & door_token;
-      boolean door_opening = ((current_door_state & DOOR_OPEN)  != 0);
-      boolean door_closing = ((current_door_state & DOOR_CLOSE) != 0);
-      boolean part_opening = (is_panel ? door_closing : door_opening);
-      int start_step = (part_opening ? pos->start_step_opening :
-                       pos->start_step_closing);
-      float move_xsize = (step_xoffset ? g->width  : 0);
-      float move_ysize = (step_yoffset ? g->height : 0);
-      int move_xsteps = (step_xoffset ? ceil(move_xsize / step_xoffset) : 0);
-      int move_ysteps = (step_yoffset ? ceil(move_ysize / step_yoffset) : 0);
-      int move_steps = (move_xsteps && move_ysteps ?
-                       MIN(move_xsteps, move_ysteps) :
-                       move_xsteps ? move_xsteps : move_ysteps) - start_step;
-      int move_delay = move_steps * step_delay;
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+                     GDI_INFO_TEXT, toolbutton_info[i].infotext,
+                     GDI_X, dx + GDI_ACTIVE_POS(pos->x),
+                     GDI_Y, dy + GDI_ACTIVE_POS(pos->y),
+                     GDI_WIDTH, gfx->width,
+                     GDI_HEIGHT, gfx->height,
+                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+                     GDI_STATE, GD_BUTTON_UNPRESSED,
+                     GDI_DESIGN_UNPRESSED, gfx->bitmap, gd_x, gd_y,
+                     GDI_DESIGN_PRESSED, gfx->bitmap, gd_xp, gd_yp,
+                     GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y,
+                     GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
+                     GDI_DECORATION_SIZE, pos->size, pos->size,
+                     GDI_DECORATION_SHIFTING, 1, 1,
+                     GDI_DIRECT_DRAW, FALSE,
+                     GDI_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_ACTION, HandleToolButtons,
+                     GDI_END);
 
-      if (door_part_skip[nr])
-       continue;
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
 
-      max_move_delay = MAX(max_move_delay, move_delay);
-      max_step_delay = (max_step_delay == 0 ? step_delay :
-                       euclid(max_step_delay, step_delay));
-      num_steps[nr] = move_steps;
+    tool_gadget[id] = gi;
+  }
+}
 
-#if 0
-#if 0
-      printf("::: %d: move_delay == %d, start_step == %d [%d]\n",
-            i, move_delay, start_step, door_part_order[i].nr);
-#else
-      if (DOOR_PART_IS_PANEL(i))
-       printf("::: %d: move_delay == %d, start_step == %d\n",
-              i, move_delay, start_step);
-#endif
-#endif
-    }
+void FreeToolButtons()
+{
+  int i;
 
-    num_move_steps = max_move_delay / max_step_delay;
+  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
+    FreeGadget(tool_gadget[i]);
+}
 
-    door_delay_value = max_step_delay;
+static void UnmapToolButtons()
+{
+  int i;
 
-#if 0
-    door_delay_value *= 10;
-#endif
+  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
+    UnmapGadget(tool_gadget[i]);
+}
 
-#if 0
-    printf("::: num_move_steps == %d, max_move_delay == %d, max_step_delay == %d\n", num_move_steps, max_move_delay, max_step_delay);
-#endif
+static void HandleToolButtons(struct GadgetInfo *gi)
+{
+  request_gadget_id = gi->custom_id;
+}
 
-    for (k = 0; k < num_move_steps; k++)
-    {
-      door_part_done_all = TRUE;
+static struct Mapping_EM_to_RND_object
+{
+  int element_em;
+  boolean is_rnd_to_em_mapping;                /* unique mapping EM <-> RND */
+  boolean is_backside;                 /* backside of moving element */
 
-      for (i = 0; i < NUM_DOORS; i++)
-       door_panel_drawn[i] = FALSE;
+  int element_rnd;
+  int action;
+  int direction;
+}
+em_object_mapping_list[] =
+{
+  {
+    Xblank,                            TRUE,   FALSE,
+    EL_EMPTY,                          -1, -1
+  },
+  {
+    Yacid_splash_eB,                   FALSE,  FALSE,
+    EL_ACID_SPLASH_RIGHT,              -1, -1
+  },
+  {
+    Yacid_splash_wB,                   FALSE,  FALSE,
+    EL_ACID_SPLASH_LEFT,               -1, -1
+  },
 
-      for (i = 0; i < MAX_DOOR_PARTS; i++)
-      {
-       int nr = door_part_order[i].nr;
-       struct DoorPartControlInfo *dpc = &door_part_controls[nr];
-       struct DoorPartPosInfo *pos = dpc->pos;
-       struct GraphicInfo *g = &graphic_info[dpc->graphic];
-       int door_token = dpc->door_token;
-       int door_index = DOOR_INDEX_FROM_TOKEN(door_token);
-       boolean is_panel = DOOR_PART_IS_PANEL(nr);
-       struct XY *panel_pos = &panel_pos_list[door_index];
-       struct Rect *door_rect = &door_rect_list[door_index];
-       Bitmap *bitmap = (is_panel ? bitmap_db_door : g->bitmap);
-       int current_door_state = door_state & door_token;
-       boolean door_opening = ((current_door_state & DOOR_OPEN)  != 0);
-       boolean door_closing = !door_opening;
-       boolean part_opening = (is_panel ? door_closing : door_opening);
-       boolean part_closing = !part_opening;
-       int start_step = (part_opening ? pos->start_step_opening :
-                         pos->start_step_closing);
-       int step_delay = pos->step_delay;
-       int step_factor = step_delay / max_step_delay;
-       int k1 = (step_factor ? k / step_factor + 1 : k);
-       int k2 = (part_opening ? k1 + start_step : num_steps[nr] - k1);
-       int kk = (k2 < 0 ? 0 : k2);
-       int src_x, src_y, src_xx, src_yy;
-       int dst_x, dst_y, dst_xx, dst_yy;
-       int width, height;
-
-#if 0
-       if (DOOR_PART_IS_PANEL(nr))
-       {
-         int start_step = pos->start_step;
-
-         k2 = (door_closing ? k1 : num_steps[nr] - k1);// - start_step;
-         kk = (k2 < 0 ? 0 : k2);
-       }
-#endif
-
-#if 0
-       // !!! TEST !!! 
-       if (nr != 16 && nr != 0)
-         continue;
-#endif
-
-#if 0
-       // !!! TEST !!! 
-       if (!is_panel)
-         continue;
-#endif
-
-#if 1
-       if (door_part_skip[nr])
-         continue;
-#endif
-
-       if (!(door_state & door_token))
-         continue;
-
-       if (!g->bitmap)
-         continue;
-
-#if 0
-       if (current_move_delay % step_delay)
-         continue;
-#endif
-
-       // draw door panel
-
-       if (!door_panel_drawn[door_index])
-       {
-#if 1
-         ClearRectangle(drawto, door_rect->x, door_rect->y,
-                        door_rect->width, door_rect->height);
-#else
-         BlitBitmap(bitmap_db_door, drawto, panel_pos->x, panel_pos->y,
-                    door_rect->width, door_rect->height,
-                    door_rect->x, door_rect->y);
-#endif
-
-         door_panel_drawn[door_index] = TRUE;
-       }
-
-       // draw opening or closing door parts
-
-       if (pos->step_xoffset < 0)      // door part on right side
-       {
-         src_xx = 0;
-         dst_xx = pos->x + ABS(kk * pos->step_xoffset);
-         width = g->width;
-
-         if (dst_xx + width > door_rect->width)
-           width = door_rect->width - dst_xx;
-       }
-       else                            // door part on left side
-       {
-         src_xx = 0;
-         dst_xx = pos->x - kk * pos->step_xoffset;
-
-         if (dst_xx < 0)
-         {
-           src_xx = ABS(dst_xx);
-           dst_xx = 0;
-         }
-
-         width = g->width - src_xx;
-
-         // printf("::: k == %d [%d] \n", k, start_step);
-       }
-
-       if (pos->step_yoffset < 0)      // door part on bottom side
-       {
-         src_yy = 0;
-         dst_yy = pos->y + ABS(kk * pos->step_yoffset);
-         height = g->height;
-
-         if (dst_yy + height > door_rect->height)
-           height = door_rect->height - dst_yy;
-       }
-       else                            // door part on top side
-       {
-         src_yy = 0;
-         dst_yy = pos->y - kk * pos->step_yoffset;
-
-         if (dst_yy < 0)
-         {
-           src_yy = ABS(dst_yy);
-           dst_yy = 0;
-         }
-
-         height = g->height - src_yy;
-       }
-
-       if (is_panel)
-       {
-         src_x = panel_pos->x + src_xx;
-         src_y = panel_pos->y + src_yy;
-       }
-       else
-       {
-         src_x = g->src_x + src_xx;
-         src_y = g->src_y + src_yy;
-       }
-
-       dst_x = door_rect->x + dst_xx;
-       dst_y = door_rect->y + dst_yy;
-
-#if 0
-       if (DOOR_PART_IS_PANEL(nr))
-       {
-         printf("::: width == %d, height == %d [%d, %d] [%d, %d]\n",
-                width, height, g->width, g->height, src_x, src_y);
-       }
-#endif
-
-       if (width  >= 0 && width  <= g->width &&
-           height >= 0 && height <= g->height)
-       {
-         if (is_panel || !pos->draw_masked)
-           BlitBitmap(bitmap, drawto, src_x, src_y, width, height,
-                      dst_x, dst_y);
-         else
-           BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height,
-                            dst_x, dst_y);
-       }
-
-#if 0
-       if (DOOR_PART_IS_PANEL(nr))
-       {
-         bitmap = bitmap_db_door;
-         src_x = panel_pos->x + src_xx;
-         src_y = panel_pos->y + src_yy;
-
-         printf("::: width == %d, height == %d [%d, %d] [%d, %d]\n",
-                width, height, g->width, g->height, src_x, src_y);
-
-         if (width  >= 0 && width  <= g->width &&
-             height >= 0 && height <= g->height)
-           BlitBitmap(bitmap, drawto, src_x, src_y,
-                            width, height,
-                            dst_x, dst_y);
-       }
-#endif
-
-       redraw_mask |= REDRAW_DOOR_FROM_TOKEN(door_token);
-
-#if 1
-       if ((part_opening && (width < 0         || height < 0)) ||
-           (part_closing && (width >= g->width && height >= g->height)))
-         door_part_done[nr] = TRUE;
-#else
-       if ((door_opening && (width < 0         || height < 0)) ||
-           (door_closing && (width >= g->width && height >= g->height)))
-         door_part_done[nr] = TRUE;
-#endif
-
-       // continue door part animations, but not panel after door has closed
-       if (!door_part_done[nr] && !(is_panel && door_closing))
-         door_part_done_all = FALSE;
-
-#if 0
-       if (!door_part_done[nr])
-         printf("::: k == %d, nr == %d\n", k, nr);
-#endif
-      }
-
-      if (!(door_state & DOOR_NO_DELAY))
-      {
-       BackToFront();
-
-       if (game_status == GAME_MODE_MAIN)
-         DoAnimation();
-
-       WaitUntilDelayReached(&door_delay, door_delay_value);
-
-       current_move_delay += max_step_delay;
-      }
-
-#if 0
-      door_part_done_all = TRUE;
-
-      for (i = 0; i < MAX_DOOR_PARTS; i++)
-       if (!door_part_done[i] &&
-           !(DOOR_PART_IS_PANEL(i) && door_closing))
-         door_part_done_all = FALSE;
-#endif
-#if 1
-      if (door_part_done_all)
-       break;
-#endif
-    }
-  }
-
-  if (door_state & DOOR_ACTION_1)
-    door1 = door_state & DOOR_ACTION_1;
-  if (door_state & DOOR_ACTION_2)
-    door2 = door_state & DOOR_ACTION_2;
-
-#if 0
-  printf("::: DOORS DONE %08x\n", door_state);
-  Delay(3000);
-  printf("::: GO!\n");
-#endif
-
-  return (door1 | door2);
-}
-
-#else
-
-// ========== OLD ==============================================================
-
-unsigned int MoveDoor(unsigned int door_state)
-{
-  static int door1 = DOOR_OPEN_1;
-  static int door2 = DOOR_CLOSE_2;
-  unsigned int door_delay = 0;
-  unsigned int door_delay_value;
-  int stepsize = 1;
-
-#if 1
-  if (door_1.width < 0 || door_1.width > DXSIZE)
-    door_1.width = DXSIZE;
-  if (door_1.height < 0 || door_1.height > DYSIZE)
-    door_1.height = DYSIZE;
-  if (door_2.width < 0 || door_2.width > VXSIZE)
-    door_2.width = VXSIZE;
-  if (door_2.height < 0 || door_2.height > VYSIZE)
-    door_2.height = VYSIZE;
-#endif
-
-  if (door_state == DOOR_GET_STATE)
-    return (door1 | door2);
-
-  if (door_state & DOOR_SET_STATE)
-  {
-    if (door_state & DOOR_ACTION_1)
-      door1 = door_state & DOOR_ACTION_1;
-    if (door_state & DOOR_ACTION_2)
-      door2 = door_state & DOOR_ACTION_2;
-
-    return (door1 | door2);
-  }
-
-  if (!(door_state & DOOR_FORCE_REDRAW))
-  {
-    if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1)
-      door_state &= ~DOOR_OPEN_1;
-    else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1)
-      door_state &= ~DOOR_CLOSE_1;
-    if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2)
-      door_state &= ~DOOR_OPEN_2;
-    else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
-      door_state &= ~DOOR_CLOSE_2;
-  }
-
-  door_delay_value = (door_state & DOOR_ACTION_1 ? door_1.step_delay :
-                     door_2.step_delay);
-
-  // door_delay_value *= 4;    // !!! TEST ONLY !!!
-
-  if (setup.quick_doors)
-  {
-    stepsize = 20;             /* must be chosen to always draw last frame */
-    door_delay_value = 0;
-  }
-
-  if (global.autoplay_leveldir)
-  {
-    door_state |= DOOR_NO_DELAY;
-    door_state &= ~DOOR_CLOSE_ALL;
-  }
-
-#if 1
-  if (game_status == GAME_MODE_EDITOR)
-    door_state |= DOOR_NO_DELAY;
-#endif
-
-  if (door_state & DOOR_ACTION)
-  {
-#if 1
-    struct GraphicInfo *g1_left  = &graphic_info[IMG_DOOR_1_WING_LEFT];
-    struct GraphicInfo *g1_right = &graphic_info[IMG_DOOR_1_WING_RIGHT];
-    struct GraphicInfo *g2_left  = &graphic_info[IMG_DOOR_2_WING_LEFT];
-    struct GraphicInfo *g2_right = &graphic_info[IMG_DOOR_2_WING_RIGHT];
-    int door_1_left_width   = g1_left->width;
-    int door_1_left_height  = g1_left->height;
-    int door_1_right_width  = g1_right->width;
-    int door_1_right_height = g1_right->height;
-    int door_2_left_width   = g2_left->width;
-    int door_2_left_height  = g2_left->height;
-    int door_2_right_width  = g2_right->width;
-    int door_2_right_height = g2_right->height;
-    int door_1_width  = MAX(door_1_left_width,  door_1_right_width);
-    int door_1_height = MAX(door_1_left_height, door_1_right_height);
-    int door_2_width  = MAX(door_2_left_width,  door_2_right_width);
-    int door_2_height = MAX(door_2_left_height, door_2_right_height);
-#endif
-    boolean handle_door_1 = (door_state & DOOR_ACTION_1);
-    boolean handle_door_2 = (door_state & DOOR_ACTION_2);
-    boolean door_1_done = (!handle_door_1);
-    boolean door_2_done = (!handle_door_2);
-    boolean door_1_vertical = (door_1.anim_mode & ANIM_VERTICAL);
-    boolean door_2_vertical = (door_2.anim_mode & ANIM_VERTICAL);
-#if 1
-#if 1
-    int door_size_1 = (door_1_vertical ? door_1_height : door_1_width);
-    int door_size_2 = (door_2_vertical ? door_2_height : door_2_width);
-#else
-    int door_size_1 = (door_1_vertical ? DYSIZE : DXSIZE);
-    int door_size_2 = (door_2_vertical ? VYSIZE : VXSIZE);
-#endif
-#else
-    int door_size_1 = (door_1_vertical ? door_1.height : door_1.width);
-    int door_size_2 = (door_2_vertical ? door_2.height : door_2.width);
-#endif
-    int max_door_size_1 = (door_1_vertical ? DYSIZE : DXSIZE);
-    int max_door_size_2 = (door_2_vertical ? VYSIZE : VXSIZE);
-    // int door_size     = (handle_door_1 ? door_size_1     : door_size_2);
-    int door_size     = (handle_door_2 ? door_size_2     : door_size_1);
-    int max_door_size = (handle_door_1 ? max_door_size_1 : max_door_size_2);
-    int door_skip = max_door_size - door_size;
-    int end = door_size;
-    int start = ((door_state & DOOR_NO_DELAY) ? end : 0);
-    int k;
-
-    if (!(door_state & DOOR_NO_DELAY) && !setup.quick_doors)
-    {
-      /* opening door sound has priority over simultaneously closing door */
-      if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
-       PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE);
-      else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
-       PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
-    }
-
-    for (k = start; k <= end && !(door_1_done && door_2_done); k += stepsize)
-    {
-      int x = k;
-#if 0
-      Bitmap *bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
-      GC gc = bitmap->stored_clip_gc;
-#endif
-
-      if (door_state & DOOR_ACTION_1 &&
-         x * door_1.step_offset <= door_size_1)
-      {
-       int a = MIN(x * door_1.step_offset, end);
-       int p = (door_state & DOOR_OPEN_1 ? end - a : a);
-#if 1
-       int i = p;
-#else
-       int i = p + door_skip;
-#endif
-
-#if 1
-       struct GraphicInfo *g_left  = &graphic_info[IMG_DOOR_1_WING_LEFT];
-       struct GraphicInfo *g_right = &graphic_info[IMG_DOOR_1_WING_RIGHT];
-       Bitmap *bm_left  = g_left->bitmap;
-       Bitmap *bm_right = g_right->bitmap;
-       GC gc_left  = bm_left->stored_clip_gc;
-       GC gc_right = bm_right->stored_clip_gc;
-#endif
-
-       int classic_dxsize = 100;
-       int classic_dysize = 280;
-       boolean classic_door_1_size = (DXSIZE == classic_dxsize &&
-                                      DYSIZE == classic_dysize);
-
-       if (door_1.anim_mode & ANIM_STATIC_PANEL)
-       {
-         BlitBitmap(bitmap_db_door, drawto,
-                    DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1,
-                    DXSIZE, DYSIZE, DX, DY);
-       }
-       else if (x <= a)
-       {
-         BlitBitmap(bitmap_db_door, drawto,
-                    DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + p / 2,
-                    DXSIZE, DYSIZE - p / 2, DX, DY);
-
-#if 1
-         // printf("::: p == %d\n", p);
-         ClearRectangle(drawto, DX, DY + DYSIZE - p / 2, DXSIZE, p / 2);
-#endif
-       }
-
-       if (door_1.anim_mode & ANIM_HORIZONTAL && x <= DXSIZE)
-       {
-#if 1
-         int src1_x = g_right->src_x;
-         int src1_y = g_right->src_y;
-         int src2_x = g_left->src_x + g_left->width - i;
-         int src2_y = g_left->src_y;
-         int dst1_x = DX + DXSIZE - i;
-         int dst1_y = DY;
-         int dst2_x = DX;
-         int dst2_y = DY;
-         int width = i;
-         int height = DYSIZE;
-
-         SetClipOrigin(bm_right, gc_right, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bm_right, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bm_left, gc_left, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bm_left, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#else
-         int src1_x = DXSIZE,          src1_y = DOOR_GFX_PAGEY1;
-         int src2_x = DXSIZE - i,      src2_y = DOOR_GFX_PAGEY1;
-         int dst1_x = DX + DXSIZE - i, dst1_y = DY;
-         int dst2_x = DX,              dst2_y = DY;
-         int width = i, height = DYSIZE;
-
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#endif
-       }
-       else if (door_1.anim_mode & ANIM_VERTICAL && x <= DYSIZE)
-       {
-#if 1
-         int src1_x = g_right->src_x;
-         int src1_y = g_right->src_y;
-         int src2_x = g_left->src_x;
-         int src2_y = g_left->src_y + g_left->height - i;
-         int dst1_x = DX;
-         int dst1_y = DY + DYSIZE - i;
-         int dst2_x = DX;
-         int dst2_y = DY;
-         int width = DXSIZE;
-         int height = i;
-
-         SetClipOrigin(bm_right, gc_right, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bm_right, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bm_left, gc_left, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bm_left, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#else
-         int src1_x = DXSIZE,          src1_y = DOOR_GFX_PAGEY1;
-         int src2_x = 0,               src2_y = DOOR_GFX_PAGEY1 + DYSIZE - i;
-         int dst1_x = DX,              dst1_y = DY + DYSIZE - i;
-         int dst2_x = DX,              dst2_y = DY;
-         int width = DXSIZE, height = i;
-
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#endif
-       }
-       else if (classic_door_1_size && x <= DXSIZE)    /* ANIM_DEFAULT */
-       {
-         int j = (door_1.anim_mode == ANIM_DEFAULT ? (DXSIZE - i) / 3 : 0);
-
-#if 1
-         int src1_x = g_right->src_x;
-         int src1_y = g_right->src_y;
-         int src2_x = g_left->src_x + g_left->width - i;
-         int src2_y = g_left->src_y;
-         int dst1_x = DX + DXSIZE - i;
-         int dst1_y = DY;
-         int dst2_x = DX;
-         int dst2_y = DY;
-         int width = i;
-         int height1 = 63, height2 = DYSIZE / 2 - height1;
-         int ypos1 = 0, ypos2 = height2;
-         int ypos3 = DYSIZE / 2, ypos4 = DYSIZE - height2;
-
-         SetClipOrigin(bm_right, gc_right,
-                       dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bm_right, drawto,
-                          src1_x, src1_y + ypos1, width, height2,
-                          dst1_x, dst1_y + ypos1 + j);
-         BlitBitmapMasked(bm_right, drawto,
-                          src1_x, src1_y + ypos3, width, height1,
-                          dst1_x, dst1_y + ypos3 + j);
-         SetClipOrigin(bm_left, gc_left,
-                       dst2_x - src2_x, dst2_y - src2_y - j);
-         BlitBitmapMasked(bm_left, drawto,
-                          src2_x, src2_y + ypos1 + j, width, height2 - j,
-                          dst2_x, dst2_y + ypos1);
-         BlitBitmapMasked(bm_left, drawto,
-                          src2_x, src2_y + ypos3, width, height1,
-                          dst2_x, dst2_y + ypos3 - j);
-
-         SetClipOrigin(bm_left, gc_left,
-                       dst2_x - src2_x, dst2_y - src2_y - j);
-         BlitBitmapMasked(bm_left, drawto,
-                          src2_x, src2_y + ypos2, width, height1,
-                          dst2_x, dst2_y + ypos2 - j);
-         BlitBitmapMasked(bm_left, drawto,
-                          src2_x, src2_y + ypos4, width, height2,
-                          dst2_x, dst2_y + ypos4 - j);
-         SetClipOrigin(bm_right, gc_right,
-                       dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bm_right, drawto,
-                          src1_x, src1_y + ypos2, width, height1,
-                          dst1_x, dst1_y + ypos2 + j);
-         BlitBitmapMasked(bm_right, drawto,
-                          src1_x, src1_y + ypos4, width, height2 - j,
-                          dst1_x, dst1_y + ypos4 + j);
-
-#else
-         int src1_x = DXSIZE,          src1_y = DOOR_GFX_PAGEY1;
-         int src2_x = DXSIZE - i,      src2_y = DOOR_GFX_PAGEY1;
-         int dst1_x = DX + DXSIZE - i, dst1_y = DY;
-         int dst2_x = DX,              dst2_y = DY;
-         int width = i, height = DYSIZE;
-         int ypos1 = 63, ypos2 = 77, ypos3 = 140, ypos4 = 203;
-
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src1_x, src1_y, width, ypos2,
-                          dst1_x, dst1_y + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src1_x, src1_y + ypos3, width, ypos1,
-                          dst1_x, dst1_y + ypos3 + j);
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y - j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src2_x, src2_y + j, width, ypos2 - j,
-                          dst2_x, dst2_y);
-         BlitBitmapMasked(bitmap, drawto,
-                          src2_x, src2_y + ypos3, width, ypos1,
-                          dst2_x, dst2_y + ypos3 - j);
-
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y - j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src2_x, src2_y + ypos2, width, ypos1,
-                          dst2_x, dst2_y + ypos2 - j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src2_x, src2_y + ypos4, width, ypos2,
-                          dst2_x, dst2_y + ypos4 - j);
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src1_x, src1_y + ypos2, width, ypos1,
-                          dst1_x, dst1_y + ypos2 + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src1_x, src1_y + ypos4, width, ypos2 - j,
-                          dst1_x, dst1_y + ypos4 + j);
-
-         /*
-         SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1);
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE, DOOR_GFX_PAGEY1, i, 77,
-                          DX + DXSIZE - i, DY + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE, DOOR_GFX_PAGEY1 + 140, i, 63,
-                          DX + DXSIZE - i, DY + 140 + j);
-         SetClipOrigin(bitmap, gc, DX - DXSIZE + i,
-                       DY - (DOOR_GFX_PAGEY1 + j));
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE - i, DOOR_GFX_PAGEY1 + j, i, 77 - j,
-                          DX, DY);
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE-i, DOOR_GFX_PAGEY1 + 140, i, 63,
-                          DX, DY + 140 - j);
-
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE - i, DOOR_GFX_PAGEY1 + 77, i, 63,
-                          DX, DY + 77 - j);
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE - i, DOOR_GFX_PAGEY1 + 203, i, 77,
-                          DX, DY + 203 - j);
-         SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1);
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE, DOOR_GFX_PAGEY1 + 77, i, 63,
-                          DX + DXSIZE - i, DY + 77 + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          DXSIZE, DOOR_GFX_PAGEY1 + 203, i, 77 - j,
-                          DX + DXSIZE - i, DY + 203 + j);
-         */
-#endif
-       }
-
-       redraw_mask |= REDRAW_DOOR_1;
-       door_1_done = (a == end);
-      }
-
-      if (door_state & DOOR_ACTION_2 &&
-         x * door_2.step_offset <= door_size_2)
-      {
-       int a = MIN(x * door_2.step_offset, door_size);
-       int p = (door_state & DOOR_OPEN_2 ? door_size - a : a);
-       int i = p + door_skip;
-
-#if 1
-       struct GraphicInfo *g_left  = &graphic_info[IMG_DOOR_2_WING_LEFT];
-       struct GraphicInfo *g_right = &graphic_info[IMG_DOOR_2_WING_RIGHT];
-       Bitmap *bm_left  = g_left->bitmap;
-       Bitmap *bm_right = g_right->bitmap;
-       GC gc_left  = bm_left->stored_clip_gc;
-       GC gc_right = bm_right->stored_clip_gc;
-#endif
-
-       int classic_vxsize = 100;
-       int classic_vysize = 100;
-       boolean classic_door_2_size = (VXSIZE == classic_vxsize &&
-                                      VYSIZE == classic_vysize);
-
-       if (door_2.anim_mode & ANIM_STATIC_PANEL)
-       {
-         BlitBitmap(bitmap_db_door, drawto,
-                    DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2,
-                    VXSIZE, VYSIZE, VX, VY);
-       }
-       else if (x <= VYSIZE)
-       {
-         BlitBitmap(bitmap_db_door, drawto,
-                    DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + p / 2,
-                    VXSIZE, VYSIZE - p / 2, VX, VY);
-
-         ClearRectangle(drawto, VX, VY + VYSIZE - p / 2, VXSIZE, p / 2);
-       }
-
-       if (door_2.anim_mode & ANIM_HORIZONTAL && x <= VXSIZE)
-       {
-#if 1
-         int src1_x = g_right->src_x;
-         int src1_y = g_right->src_y;
-         int src2_x = g_left->src_x + g_left->width - i;
-         int src2_y = g_left->src_y;
-         int dst1_x = VX + VXSIZE - i;
-         int dst1_y = VY;
-         int dst2_x = VX;
-         int dst2_y = VY;
-         int width = i;
-         int height = VYSIZE;
-
-         SetClipOrigin(bm_right, gc_right, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bm_right, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bm_left, gc_left, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bm_left, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#else
-         int src1_x = VXSIZE,          src1_y = DOOR_GFX_PAGEY2;
-         int src2_x = VXSIZE - i,      src2_y = DOOR_GFX_PAGEY2;
-         int dst1_x = VX + VXSIZE - i, dst1_y = VY;
-         int dst2_x = VX,              dst2_y = VY;
-         int width = i, height = VYSIZE;
-
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#endif
-       }
-       else if (door_2.anim_mode & ANIM_VERTICAL && x <= VYSIZE)
-       {
-#if 1
-         int src1_x = g_right->src_x;
-         int src1_y = g_right->src_y;
-         int src2_x = g_left->src_x;
-         int src2_y = g_left->src_y + g_left->height - i;
-         int dst1_x = VX;
-         int dst1_y = VY + VYSIZE - i;
-         int dst2_x = VX;
-         int dst2_y = VY;
-         int width = VXSIZE;
-         int height = i;
-
-         SetClipOrigin(bm_right, gc_right, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bm_right, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bm_left, gc_left, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bm_left, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#else
-         int src1_x = VXSIZE,          src1_y = DOOR_GFX_PAGEY2;
-         int src2_x = 0,               src2_y = DOOR_GFX_PAGEY2 + VYSIZE - i;
-         int dst1_x = VX,              dst1_y = VY + VYSIZE - i;
-         int dst2_x = VX,              dst2_y = VY;
-         int width = VXSIZE, height = i;
-
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y);
-         BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height,
-                          dst1_x, dst1_y);
-
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y);
-         BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height,
-                          dst2_x, dst2_y);
-#endif
-       }
-       else if (classic_door_2_size && x <= VXSIZE)    /* ANIM_DEFAULT */
-       {
-         int j = (door_2.anim_mode == ANIM_DEFAULT ? (VXSIZE - i) / 3 : 0);
-
-#if 1
-         int src1_x = g_right->src_x;
-         int src1_y = g_right->src_y;
-         int src2_x = g_left->src_x + g_left->width - i;
-         int src2_y = g_left->src_y;
-         int dst1_x = VX + VXSIZE - i;
-         int dst1_y = VY;
-         int dst2_x = VX;
-         int dst2_y = VY;
-         int width = i;
-         int height = VYSIZE / 2;
-         int ypos1 = 0, ypos2 = VYSIZE / 2;
-
-         SetClipOrigin(bm_right, gc_right,
-                       dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bm_right, drawto,
-                          src1_x, src1_y + ypos1, width, height,
-                          dst1_x, dst1_y + ypos1 + j);
-         SetClipOrigin(bm_left, gc_left,
-                       dst2_x - src2_x, dst2_y - src2_y - j);
-         BlitBitmapMasked(bm_left, drawto,
-                          src2_x, src2_y + ypos1 + j, width, height - j,
-                          dst2_x, dst2_y + ypos1);
-
-         SetClipOrigin(bm_left, gc_left,
-                       dst2_x - src2_x, dst2_y - src2_y - j);
-         BlitBitmapMasked(bm_left, drawto,
-                          src2_x, src2_y + ypos2, width, height,
-                          dst2_x, dst2_y + ypos2 - j);
-         SetClipOrigin(bm_right, gc_right,
-                       dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bm_right, drawto,
-                          src1_x, src1_y + ypos2, width, height - j,
-                          dst1_x, dst1_y + ypos2 + j);
-#else
-         int src1_x = VXSIZE,          src1_y = DOOR_GFX_PAGEY2;
-         int src2_x = VXSIZE - i,      src2_y = DOOR_GFX_PAGEY2;
-         int dst1_x = VX + VXSIZE - i, dst1_y = VY;
-         int dst2_x = VX,              dst2_y = VY;
-         int width = i, height = VYSIZE;
-         int ypos = VYSIZE / 2;
-
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src1_x, src1_y, width, ypos,
-                          dst1_x, dst1_y + j);
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src1_y - j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src2_x, src2_y + j, width, ypos - j,
-                          dst2_x, dst2_y);
-
-         SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src1_y - j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src2_x, src2_y + ypos, width, ypos,
-                          dst2_x, dst2_y + ypos - j);
-         SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y + j);
-         BlitBitmapMasked(bitmap, drawto,
-                          src1_x, src1_y + ypos, width, ypos - j,
-                          dst1_x, dst1_y + ypos + j);
-
-         /*
-         SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2);
-         BlitBitmapMasked(bitmap, drawto,
-                          VXSIZE, DOOR_GFX_PAGEY2, i, VYSIZE / 2,
-                          VX + VXSIZE - i, VY + j);
-         SetClipOrigin(bitmap, gc,
-                       VX - VXSIZE + i, VY - (DOOR_GFX_PAGEY2 + j));
-         BlitBitmapMasked(bitmap, drawto,
-                          VXSIZE - i, DOOR_GFX_PAGEY2 + j, i, VYSIZE / 2 - j,
-                          VX, VY);
-
-         BlitBitmapMasked(bitmap, drawto,
-                          VXSIZE - i, DOOR_GFX_PAGEY2 + VYSIZE / 2,
-                          i, VYSIZE / 2, VX, VY + VYSIZE / 2 - j);
-         SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2);
-         BlitBitmapMasked(bitmap, drawto,
-                          VXSIZE, DOOR_GFX_PAGEY2 + VYSIZE / 2,
-                          i, VYSIZE / 2 - j,
-                          VX + VXSIZE - i, VY + VYSIZE / 2 + j);
-         */
-#endif
-       }
-
-       redraw_mask |= REDRAW_DOOR_2;
-       door_2_done = (a == VXSIZE);
-      }
-
-      if (!(door_state & DOOR_NO_DELAY))
-      {
-       BackToFront();
-
-       if (game_status == GAME_MODE_MAIN)
-         DoAnimation();
-
-       WaitUntilDelayReached(&door_delay, door_delay_value);
-      }
-    }
-  }
-
-  if (door_state & DOOR_ACTION_1)
-    door1 = door_state & DOOR_ACTION_1;
-  if (door_state & DOOR_ACTION_2)
-    door2 = door_state & DOOR_ACTION_2;
-
-  return (door1 | door2);
-}
-
-#endif
-
-void DrawSpecialEditorDoor()
-{
-#if 1
-  struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
-  int top_border_width = gfx1->width;
-  int top_border_height = gfx1->height;
-  int outer_border = viewport.door_2[GAME_MODE_EDITOR].border_size;
-  int ex = EX - outer_border;
-  int ey = EY - outer_border;
-  int vy = VY - outer_border;
-  int exsize = EXSIZE + 2 * outer_border;
-
-  CloseDoor(DOOR_CLOSE_2);
-
-  /* draw bigger level editor toolbox window */
-  BlitBitmap(gfx1->bitmap, drawto, gfx1->src_x, gfx1->src_y,
-            top_border_width, top_border_height, ex, ey - top_border_height);
-  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, ex, vy,
-            exsize, EYSIZE - VYSIZE + outer_border, ex, ey);
-#else
-  /* draw bigger level editor toolbox window */
-  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
-             DOOR_GFX_PAGEX7, 0, EXSIZE + 8, 8,
-             EX - 4, EY - 12);
-  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
-             EX - 6, VY - 4, EXSIZE + 12, EYSIZE - VYSIZE + 4,
-             EX - 6, EY - 4);
-#endif
-
-  redraw_mask |= REDRAW_ALL;
-}
-
-void UndrawSpecialEditorDoor()
-{
-#if 1
-  struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION];
-  int top_border_width = gfx1->width;
-  int top_border_height = gfx1->height;
-  int outer_border = viewport.door_2[GAME_MODE_EDITOR].border_size;
-  int ex = EX - outer_border;
-  int ey = EY - outer_border;
-  int ey_top = ey - top_border_height;
-  int exsize = EXSIZE + 2 * outer_border;
-  int eysize = EYSIZE + 2 * outer_border;
-
-  /* draw normal tape recorder window */
-  if (graphic_info[IMG_GLOBAL_BORDER].bitmap)
-  {
-    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
-              ex, ey_top, top_border_width, top_border_height,
-              ex, ey_top);
-    BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
-              ex, ey, exsize, eysize, ex, ey);
-  }
-  else
-  {
-    // if screen background is set to "[NONE]", clear editor toolbox window
-    ClearRectangle(drawto, ex, ey_top, top_border_width, top_border_height);
-    ClearRectangle(drawto, ex, ey, exsize, eysize);
-  }
-#else
-  /* draw normal tape recorder window */
-  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
-             EX - 6, EY - 12, EXSIZE + 12, EYSIZE - VYSIZE + 12,
-             EX - 6, EY - 12);
-#endif
-
-  redraw_mask |= REDRAW_ALL;
-}
-
-
-/* ---------- new tool button stuff ---------------------------------------- */
-
-#if 1
-
-static struct
-{
-  int graphic;
-  struct TextPosInfo *pos;
-  int gadget_id;
-  char *infotext;
-} toolbutton_info[NUM_TOOL_BUTTONS] =
-{
-  {
-    IMG_REQUEST_BUTTON_GFX_YES,                &request.button.yes,
-    TOOL_CTRL_ID_YES,                  "yes"
-  },
-  {
-    IMG_REQUEST_BUTTON_GFX_NO,         &request.button.no,
-    TOOL_CTRL_ID_NO,                   "no"
-  },
-  {
-    IMG_REQUEST_BUTTON_GFX_CONFIRM,    &request.button.confirm,
-    TOOL_CTRL_ID_CONFIRM,              "confirm"
-  },
-  {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_1,   &request.button.player_1,
-    TOOL_CTRL_ID_PLAYER_1,             "player 1"
-  },
-  {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_2,   &request.button.player_2,
-    TOOL_CTRL_ID_PLAYER_2,             "player 2"
-  },
-  {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_3,   &request.button.player_3,
-    TOOL_CTRL_ID_PLAYER_3,             "player 3"
-  },
-  {
-    IMG_REQUEST_BUTTON_GFX_PLAYER_4,   &request.button.player_4,
-    TOOL_CTRL_ID_PLAYER_4,             "player 4"
-  }
-};
-
-void CreateToolButtons()
-{
-  int i;
-
-  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
-  {
-    struct GraphicInfo *gfx = &graphic_info[toolbutton_info[i].graphic];
-    struct TextPosInfo *pos = toolbutton_info[i].pos;
-    struct GadgetInfo *gi;
-    Bitmap *deco_bitmap = None;
-    int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
-    unsigned int event_mask = GD_EVENT_RELEASED;
-    int dx = DX;
-    int dy = DY;
-    int gd_x = gfx->src_x;
-    int gd_y = gfx->src_y;
-    int gd_xp = gfx->src_x + gfx->pressed_xoffset;
-    int gd_yp = gfx->src_y + gfx->pressed_yoffset;
-    int id = i;
-
-    if (global.use_envelope_request)
-      setRequestPosition(&dx, &dy, TRUE);
-
-    if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
-    {
-      int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
-
-      getSizedGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0,
-                           pos->size, &deco_bitmap, &deco_x, &deco_y);
-      deco_xpos = (gfx->width  - pos->size) / 2;
-      deco_ypos = (gfx->height - pos->size) / 2;
-    }
-
-    gi = CreateGadget(GDI_CUSTOM_ID, id,
-                     GDI_INFO_TEXT, toolbutton_info[i].infotext,
-                     GDI_X, dx + GDI_ACTIVE_POS(pos->x),
-                     GDI_Y, dy + GDI_ACTIVE_POS(pos->y),
-                     GDI_WIDTH, gfx->width,
-                     GDI_HEIGHT, gfx->height,
-                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
-                     GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gfx->bitmap, gd_x, gd_y,
-                     GDI_DESIGN_PRESSED, gfx->bitmap, gd_xp, gd_yp,
-                     GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y,
-                     GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
-                     GDI_DECORATION_SIZE, pos->size, pos->size,
-                     GDI_DECORATION_SHIFTING, 1, 1,
-                     GDI_DIRECT_DRAW, FALSE,
-                     GDI_EVENT_MASK, event_mask,
-                     GDI_CALLBACK_ACTION, HandleToolButtons,
-                     GDI_END);
-
-    if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
-
-    tool_gadget[id] = gi;
-  }
-}
-
-#else
-
-/* graphic position values for tool buttons */
-#define TOOL_BUTTON_YES_XPOS           2
-#define TOOL_BUTTON_YES_YPOS           250
-#define TOOL_BUTTON_YES_GFX_YPOS       0
-#define TOOL_BUTTON_YES_XSIZE          46
-#define TOOL_BUTTON_YES_YSIZE          28
-#define TOOL_BUTTON_NO_XPOS            52
-#define TOOL_BUTTON_NO_YPOS            TOOL_BUTTON_YES_YPOS
-#define TOOL_BUTTON_NO_GFX_YPOS                TOOL_BUTTON_YES_GFX_YPOS
-#define TOOL_BUTTON_NO_XSIZE           TOOL_BUTTON_YES_XSIZE
-#define TOOL_BUTTON_NO_YSIZE           TOOL_BUTTON_YES_YSIZE
-#define TOOL_BUTTON_CONFIRM_XPOS       TOOL_BUTTON_YES_XPOS
-#define TOOL_BUTTON_CONFIRM_YPOS       TOOL_BUTTON_YES_YPOS
-#define TOOL_BUTTON_CONFIRM_GFX_YPOS   30
-#define TOOL_BUTTON_CONFIRM_XSIZE      96
-#define TOOL_BUTTON_CONFIRM_YSIZE      TOOL_BUTTON_YES_YSIZE
-#define TOOL_BUTTON_PLAYER_XSIZE       30
-#define TOOL_BUTTON_PLAYER_YSIZE       30
-#define TOOL_BUTTON_PLAYER_GFX_XPOS    5
-#define TOOL_BUTTON_PLAYER_GFX_YPOS    185
-#define TOOL_BUTTON_PLAYER_XPOS                (5 + TOOL_BUTTON_PLAYER_XSIZE / 2)
-#define TOOL_BUTTON_PLAYER_YPOS                (215 - TOOL_BUTTON_PLAYER_YSIZE / 2)
-#define TOOL_BUTTON_PLAYER1_XPOS       (TOOL_BUTTON_PLAYER_XPOS \
-                                        + 0 * TOOL_BUTTON_PLAYER_XSIZE)
-#define TOOL_BUTTON_PLAYER2_XPOS       (TOOL_BUTTON_PLAYER_XPOS \
-                                        + 1 * TOOL_BUTTON_PLAYER_XSIZE)
-#define TOOL_BUTTON_PLAYER3_XPOS       (TOOL_BUTTON_PLAYER_XPOS \
-                                        + 0 * TOOL_BUTTON_PLAYER_XSIZE)
-#define TOOL_BUTTON_PLAYER4_XPOS       (TOOL_BUTTON_PLAYER_XPOS \
-                                        + 1 * TOOL_BUTTON_PLAYER_XSIZE)
-#define TOOL_BUTTON_PLAYER1_YPOS       (TOOL_BUTTON_PLAYER_YPOS \
-                                        + 0 * TOOL_BUTTON_PLAYER_YSIZE)
-#define TOOL_BUTTON_PLAYER2_YPOS       (TOOL_BUTTON_PLAYER_YPOS \
-                                        + 0 * TOOL_BUTTON_PLAYER_YSIZE)
-#define TOOL_BUTTON_PLAYER3_YPOS       (TOOL_BUTTON_PLAYER_YPOS \
-                                        + 1 * TOOL_BUTTON_PLAYER_YSIZE)
-#define TOOL_BUTTON_PLAYER4_YPOS       (TOOL_BUTTON_PLAYER_YPOS \
-                                        + 1 * TOOL_BUTTON_PLAYER_YSIZE)
-
-static struct
-{
-  int xpos, ypos;
-  int x, y;
-  int width, height;
-  int gadget_id;
-  char *infotext;
-} toolbutton_info[NUM_TOOL_BUTTONS] =
-{
-  {
-    TOOL_BUTTON_YES_XPOS,      TOOL_BUTTON_YES_GFX_YPOS,
-    TOOL_BUTTON_YES_XPOS,      TOOL_BUTTON_YES_YPOS,
-    TOOL_BUTTON_YES_XSIZE,     TOOL_BUTTON_YES_YSIZE,
-    TOOL_CTRL_ID_YES,
-    "yes"
-  },
-  {
-    TOOL_BUTTON_NO_XPOS,       TOOL_BUTTON_NO_GFX_YPOS,
-    TOOL_BUTTON_NO_XPOS,       TOOL_BUTTON_NO_YPOS,
-    TOOL_BUTTON_NO_XSIZE,      TOOL_BUTTON_NO_YSIZE,
-    TOOL_CTRL_ID_NO,
-    "no"
-  },
-  {
-    TOOL_BUTTON_CONFIRM_XPOS,  TOOL_BUTTON_CONFIRM_GFX_YPOS,
-    TOOL_BUTTON_CONFIRM_XPOS,  TOOL_BUTTON_CONFIRM_YPOS,
-    TOOL_BUTTON_CONFIRM_XSIZE, TOOL_BUTTON_CONFIRM_YSIZE,
-    TOOL_CTRL_ID_CONFIRM,
-    "confirm"
-  },
-  {
-    TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS,
-    TOOL_BUTTON_PLAYER1_XPOS,  TOOL_BUTTON_PLAYER1_YPOS,
-    TOOL_BUTTON_PLAYER_XSIZE,  TOOL_BUTTON_PLAYER_YSIZE,
-    TOOL_CTRL_ID_PLAYER_1,
-    "player 1"
-  },
-  {
-    TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS,
-    TOOL_BUTTON_PLAYER2_XPOS,  TOOL_BUTTON_PLAYER2_YPOS,
-    TOOL_BUTTON_PLAYER_XSIZE,  TOOL_BUTTON_PLAYER_YSIZE,
-    TOOL_CTRL_ID_PLAYER_2,
-    "player 2"
-  },
-  {
-    TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS,
-    TOOL_BUTTON_PLAYER3_XPOS,  TOOL_BUTTON_PLAYER3_YPOS,
-    TOOL_BUTTON_PLAYER_XSIZE,  TOOL_BUTTON_PLAYER_YSIZE,
-    TOOL_CTRL_ID_PLAYER_3,
-    "player 3"
-  },
-  {
-    TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS,
-    TOOL_BUTTON_PLAYER4_XPOS,  TOOL_BUTTON_PLAYER4_YPOS,
-    TOOL_BUTTON_PLAYER_XSIZE,  TOOL_BUTTON_PLAYER_YSIZE,
-    TOOL_CTRL_ID_PLAYER_4,
-    "player 4"
-  }
-};
-
-void CreateToolButtons()
-{
-  int i;
-
-  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
-  {
-    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
-    Bitmap *deco_bitmap = None;
-    int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
-    struct GadgetInfo *gi;
-    unsigned int event_mask;
-    int gd_xoffset, gd_yoffset;
-    int gd_x1, gd_x2, gd_y;
-    int id = i;
-
-    event_mask = GD_EVENT_RELEASED;
-
-    gd_xoffset = toolbutton_info[i].xpos;
-    gd_yoffset = toolbutton_info[i].ypos;
-    gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
-    gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
-    gd_y = DOOR_GFX_PAGEY1 + gd_yoffset;
-
-    if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
-    {
-      int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
-
-      getMiniGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr),
-                          &deco_bitmap, &deco_x, &deco_y);
-      deco_xpos = (toolbutton_info[i].width - MINI_TILEX) / 2;
-      deco_ypos = (toolbutton_info[i].height - MINI_TILEY) / 2;
-    }
-
-    gi = CreateGadget(GDI_CUSTOM_ID, id,
-                     GDI_INFO_TEXT, toolbutton_info[i].infotext,
-                     GDI_X, DX + GDI_ACTIVE_POS(toolbutton_info[i].x),
-                     GDI_Y, DY + GDI_ACTIVE_POS(toolbutton_info[i].y),
-                     GDI_WIDTH, toolbutton_info[i].width,
-                     GDI_HEIGHT, toolbutton_info[i].height,
-                     GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
-                     GDI_STATE, GD_BUTTON_UNPRESSED,
-                     GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y,
-                     GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y,
-                     GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y,
-                     GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
-                     GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
-                     GDI_DECORATION_SHIFTING, 1, 1,
-                     GDI_DIRECT_DRAW, FALSE,
-                     GDI_EVENT_MASK, event_mask,
-                     GDI_CALLBACK_ACTION, HandleToolButtons,
-                     GDI_END);
-
-    if (gi == NULL)
-      Error(ERR_EXIT, "cannot create gadget");
-
-    tool_gadget[id] = gi;
-  }
-}
-
-#endif
-
-void FreeToolButtons()
-{
-  int i;
-
-  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
-    FreeGadget(tool_gadget[i]);
-}
-
-static void UnmapToolButtons()
-{
-  int i;
-
-  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
-    UnmapGadget(tool_gadget[i]);
-}
-
-static void HandleToolButtons(struct GadgetInfo *gi)
-{
-  request_gadget_id = gi->custom_id;
-}
-
-static struct Mapping_EM_to_RND_object
-{
-  int element_em;
-  boolean is_rnd_to_em_mapping;                /* unique mapping EM <-> RND */
-  boolean is_backside;                 /* backside of moving element */
-
-  int element_rnd;
-  int action;
-  int direction;
-}
-em_object_mapping_list[] =
-{
-  {
-    Xblank,                            TRUE,   FALSE,
-    EL_EMPTY,                          -1, -1
-  },
-  {
-    Yacid_splash_eB,                   FALSE,  FALSE,
-    EL_ACID_SPLASH_RIGHT,              -1, -1
-  },
-  {
-    Yacid_splash_wB,                   FALSE,  FALSE,
-    EL_ACID_SPLASH_LEFT,               -1, -1
-  },
-
-#ifdef EM_ENGINE_BAD_ROLL
-  {
-    Xstone_force_e,                    FALSE,  FALSE,
-    EL_ROCK,                           -1, MV_BIT_RIGHT
-  },
-  {
-    Xstone_force_w,                    FALSE,  FALSE,
-    EL_ROCK,                           -1, MV_BIT_LEFT
-  },
-  {
-    Xnut_force_e,                      FALSE,  FALSE,
-    EL_NUT,                            -1, MV_BIT_RIGHT
-  },
-  {
-    Xnut_force_w,                      FALSE,  FALSE,
-    EL_NUT,                            -1, MV_BIT_LEFT
-  },
-  {
-    Xspring_force_e,                   FALSE,  FALSE,
-    EL_SPRING,                         -1, MV_BIT_RIGHT
-  },
-  {
-    Xspring_force_w,                   FALSE,  FALSE,
-    EL_SPRING,                         -1, MV_BIT_LEFT
-  },
-  {
-    Xemerald_force_e,                  FALSE,  FALSE,
-    EL_EMERALD,                                -1, MV_BIT_RIGHT
-  },
-  {
-    Xemerald_force_w,                  FALSE,  FALSE,
-    EL_EMERALD,                                -1, MV_BIT_LEFT
-  },
-  {
-    Xdiamond_force_e,                  FALSE,  FALSE,
-    EL_DIAMOND,                                -1, MV_BIT_RIGHT
-  },
-  {
-    Xdiamond_force_w,                  FALSE,  FALSE,
-    EL_DIAMOND,                                -1, MV_BIT_LEFT
-  },
-  {
-    Xbomb_force_e,                     FALSE,  FALSE,
-    EL_BOMB,                           -1, MV_BIT_RIGHT
-  },
-  {
-    Xbomb_force_w,                     FALSE,  FALSE,
-    EL_BOMB,                           -1, MV_BIT_LEFT
-  },
-#endif /* EM_ENGINE_BAD_ROLL */
-
-  {
-    Xstone,                            TRUE,   FALSE,
-    EL_ROCK,                           -1, -1
-  },
-  {
-    Xstone_pause,                      FALSE,  FALSE,
-    EL_ROCK,                           -1, -1
-  },
-  {
-    Xstone_fall,                       FALSE,  FALSE,
-    EL_ROCK,                           -1, -1
-  },
-  {
-    Ystone_s,                          FALSE,  FALSE,
-    EL_ROCK,                           ACTION_FALLING, -1
-  },
-  {
-    Ystone_sB,                         FALSE,  TRUE,
-    EL_ROCK,                           ACTION_FALLING, -1
-  },
-  {
-    Ystone_e,                          FALSE,  FALSE,
-    EL_ROCK,                           ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ystone_eB,                         FALSE,  TRUE,
-    EL_ROCK,                           ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ystone_w,                          FALSE,  FALSE,
-    EL_ROCK,                           ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Ystone_wB,                         FALSE,  TRUE,
-    EL_ROCK,                           ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Xnut,                              TRUE,   FALSE,
-    EL_NUT,                            -1, -1
-  },
-  {
-    Xnut_pause,                                FALSE,  FALSE,
-    EL_NUT,                            -1, -1
-  },
-  {
-    Xnut_fall,                         FALSE,  FALSE,
-    EL_NUT,                            -1, -1
-  },
-  {
-    Ynut_s,                            FALSE,  FALSE,
-    EL_NUT,                            ACTION_FALLING, -1
-  },
-  {
-    Ynut_sB,                           FALSE,  TRUE,
-    EL_NUT,                            ACTION_FALLING, -1
-  },
-  {
-    Ynut_e,                            FALSE,  FALSE,
-    EL_NUT,                            ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ynut_eB,                           FALSE,  TRUE,
-    EL_NUT,                            ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ynut_w,                            FALSE,  FALSE,
-    EL_NUT,                            ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Ynut_wB,                           FALSE,  TRUE,
-    EL_NUT,                            ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Xbug_n,                            TRUE,   FALSE,
-    EL_BUG_UP,                         -1, -1
-  },
-  {
-    Xbug_e,                            TRUE,   FALSE,
-    EL_BUG_RIGHT,                      -1, -1
-  },
-  {
-    Xbug_s,                            TRUE,   FALSE,
-    EL_BUG_DOWN,                       -1, -1
-  },
-  {
-    Xbug_w,                            TRUE,   FALSE,
-    EL_BUG_LEFT,                       -1, -1
-  },
-  {
-    Xbug_gon,                          FALSE,  FALSE,
-    EL_BUG_UP,                         -1, -1
-  },
-  {
-    Xbug_goe,                          FALSE,  FALSE,
-    EL_BUG_RIGHT,                      -1, -1
-  },
-  {
-    Xbug_gos,                          FALSE,  FALSE,
-    EL_BUG_DOWN,                       -1, -1
-  },
-  {
-    Xbug_gow,                          FALSE,  FALSE,
-    EL_BUG_LEFT,                       -1, -1
-  },
-  {
-    Ybug_n,                            FALSE,  FALSE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_UP
-  },
-  {
-    Ybug_nB,                           FALSE,  TRUE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_UP
-  },
-  {
-    Ybug_e,                            FALSE,  FALSE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ybug_eB,                           FALSE,  TRUE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ybug_s,                            FALSE,  FALSE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_DOWN
-  },
-  {
-    Ybug_sB,                           FALSE,  TRUE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_DOWN
-  },
-  {
-    Ybug_w,                            FALSE,  FALSE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Ybug_wB,                           FALSE,  TRUE,
-    EL_BUG,                            ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Ybug_w_n,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_LEFT, MV_BIT_UP
-  },
-  {
-    Ybug_n_e,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_UP, MV_BIT_RIGHT
-  },
-  {
-    Ybug_e_s,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN
-  },
-  {
-    Ybug_s_w,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT
-  },
-  {
-    Ybug_e_n,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_RIGHT, MV_BIT_UP
-  },
-  {
-    Ybug_s_e,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT
-  },
-  {
-    Ybug_w_s,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN
-  },
-  {
-    Ybug_n_w,                          FALSE,  FALSE,
-    EL_BUG,                            ACTION_TURNING_FROM_UP, MV_BIT_LEFT
-  },
-  {
-    Ybug_stone,                                FALSE,  FALSE,
-    EL_BUG,                            ACTION_SMASHED_BY_ROCK, -1
-  },
-  {
-    Ybug_spring,                       FALSE,  FALSE,
-    EL_BUG,                            ACTION_SMASHED_BY_SPRING, -1
-  },
-  {
-    Xtank_n,                           TRUE,   FALSE,
-    EL_SPACESHIP_UP,                   -1, -1
-  },
-  {
-    Xtank_e,                           TRUE,   FALSE,
-    EL_SPACESHIP_RIGHT,                        -1, -1
-  },
-  {
-    Xtank_s,                           TRUE,   FALSE,
-    EL_SPACESHIP_DOWN,                 -1, -1
-  },
-  {
-    Xtank_w,                           TRUE,   FALSE,
-    EL_SPACESHIP_LEFT,                 -1, -1
-  },
-  {
-    Xtank_gon,                         FALSE,  FALSE,
-    EL_SPACESHIP_UP,                   -1, -1
-  },
-  {
-    Xtank_goe,                         FALSE,  FALSE,
-    EL_SPACESHIP_RIGHT,                        -1, -1
-  },
-  {
-    Xtank_gos,                         FALSE,  FALSE,
-    EL_SPACESHIP_DOWN,                 -1, -1
-  },
-  {
-    Xtank_gow,                         FALSE,  FALSE,
-    EL_SPACESHIP_LEFT,                 -1, -1
-  },
-  {
-    Ytank_n,                           FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_UP
-  },
-  {
-    Ytank_nB,                          FALSE,  TRUE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_UP
-  },
-  {
-    Ytank_e,                           FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ytank_eB,                          FALSE,  TRUE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_RIGHT
-  },
-  {
-    Ytank_s,                           FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_DOWN
-  },
-  {
-    Ytank_sB,                          FALSE,  TRUE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_DOWN
-  },
-  {
-    Ytank_w,                           FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Ytank_wB,                          FALSE,  TRUE,
-    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_LEFT
-  },
-  {
-    Ytank_w_n,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_LEFT, MV_BIT_UP
-  },
-  {
-    Ytank_n_e,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_UP, MV_BIT_RIGHT
-  },
-  {
-    Ytank_e_s,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN
-  },
-  {
-    Ytank_s_w,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT
-  },
+#ifdef EM_ENGINE_BAD_ROLL
   {
-    Ytank_e_n,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_RIGHT, MV_BIT_UP
+    Xstone_force_e,                    FALSE,  FALSE,
+    EL_ROCK,                           -1, MV_BIT_RIGHT
   },
   {
-    Ytank_s_e,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT
+    Xstone_force_w,                    FALSE,  FALSE,
+    EL_ROCK,                           -1, MV_BIT_LEFT
   },
   {
-    Ytank_w_s,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN
+    Xnut_force_e,                      FALSE,  FALSE,
+    EL_NUT,                            -1, MV_BIT_RIGHT
   },
   {
-    Ytank_n_w,                         FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_TURNING_FROM_UP, MV_BIT_LEFT
+    Xnut_force_w,                      FALSE,  FALSE,
+    EL_NUT,                            -1, MV_BIT_LEFT
   },
   {
-    Ytank_stone,                       FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_SMASHED_BY_ROCK, -1
+    Xspring_force_e,                   FALSE,  FALSE,
+    EL_SPRING,                         -1, MV_BIT_RIGHT
   },
   {
-    Ytank_spring,                      FALSE,  FALSE,
-    EL_SPACESHIP,                      ACTION_SMASHED_BY_SPRING, -1
+    Xspring_force_w,                   FALSE,  FALSE,
+    EL_SPRING,                         -1, MV_BIT_LEFT
   },
   {
-    Xandroid,                          TRUE,   FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, -1
+    Xemerald_force_e,                  FALSE,  FALSE,
+    EL_EMERALD,                                -1, MV_BIT_RIGHT
   },
   {
-    Xandroid_1_n,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_UP
+    Xemerald_force_w,                  FALSE,  FALSE,
+    EL_EMERALD,                                -1, MV_BIT_LEFT
   },
   {
-    Xandroid_2_n,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_UP
+    Xdiamond_force_e,                  FALSE,  FALSE,
+    EL_DIAMOND,                                -1, MV_BIT_RIGHT
   },
   {
-    Xandroid_1_e,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_RIGHT
+    Xdiamond_force_w,                  FALSE,  FALSE,
+    EL_DIAMOND,                                -1, MV_BIT_LEFT
   },
   {
-    Xandroid_2_e,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_RIGHT
+    Xbomb_force_e,                     FALSE,  FALSE,
+    EL_BOMB,                           -1, MV_BIT_RIGHT
   },
   {
-    Xandroid_1_w,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_LEFT
+    Xbomb_force_w,                     FALSE,  FALSE,
+    EL_BOMB,                           -1, MV_BIT_LEFT
   },
+#endif /* EM_ENGINE_BAD_ROLL */
+
   {
-    Xandroid_2_w,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_LEFT
+    Xstone,                            TRUE,   FALSE,
+    EL_ROCK,                           -1, -1
   },
   {
-    Xandroid_1_s,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_DOWN
+    Xstone_pause,                      FALSE,  FALSE,
+    EL_ROCK,                           -1, -1
   },
   {
-    Xandroid_2_s,                      FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_DOWN
+    Xstone_fall,                       FALSE,  FALSE,
+    EL_ROCK,                           -1, -1
   },
   {
-    Yandroid_n,                                FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_UP
+    Ystone_s,                          FALSE,  FALSE,
+    EL_ROCK,                           ACTION_FALLING, -1
   },
   {
-    Yandroid_nB,                       FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_UP
+    Ystone_sB,                         FALSE,  TRUE,
+    EL_ROCK,                           ACTION_FALLING, -1
   },
   {
-    Yandroid_ne,                       FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_UPRIGHT
+    Ystone_e,                          FALSE,  FALSE,
+    EL_ROCK,                           ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yandroid_neB,                      FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_UPRIGHT
+    Ystone_eB,                         FALSE,  TRUE,
+    EL_ROCK,                           ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yandroid_e,                                FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_RIGHT
+    Ystone_w,                          FALSE,  FALSE,
+    EL_ROCK,                           ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yandroid_eB,                       FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_RIGHT
+    Ystone_wB,                         FALSE,  TRUE,
+    EL_ROCK,                           ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yandroid_se,                       FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_DOWNRIGHT
+    Xnut,                              TRUE,   FALSE,
+    EL_NUT,                            -1, -1
   },
   {
-    Yandroid_seB,                      FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_DOWNRIGHT
+    Xnut_pause,                                FALSE,  FALSE,
+    EL_NUT,                            -1, -1
   },
   {
-    Yandroid_s,                                FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_DOWN
+    Xnut_fall,                         FALSE,  FALSE,
+    EL_NUT,                            -1, -1
   },
   {
-    Yandroid_sB,                       FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_DOWN
+    Ynut_s,                            FALSE,  FALSE,
+    EL_NUT,                            ACTION_FALLING, -1
   },
   {
-    Yandroid_sw,                       FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_DOWNLEFT
+    Ynut_sB,                           FALSE,  TRUE,
+    EL_NUT,                            ACTION_FALLING, -1
   },
   {
-    Yandroid_swB,                      FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_DOWNLEFT
+    Ynut_e,                            FALSE,  FALSE,
+    EL_NUT,                            ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yandroid_w,                                FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_LEFT
+    Ynut_eB,                           FALSE,  TRUE,
+    EL_NUT,                            ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yandroid_wB,                       FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_LEFT
+    Ynut_w,                            FALSE,  FALSE,
+    EL_NUT,                            ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yandroid_nw,                       FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_UPLEFT
+    Ynut_wB,                           FALSE,  TRUE,
+    EL_NUT,                            ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yandroid_nwB,                      FALSE,  TRUE,
-    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_UPLEFT
+    Xbug_n,                            TRUE,   FALSE,
+    EL_BUG_UP,                         -1, -1
   },
   {
-    Xspring,                           TRUE,   FALSE,
-    EL_SPRING,                         -1, -1
+    Xbug_e,                            TRUE,   FALSE,
+    EL_BUG_RIGHT,                      -1, -1
   },
   {
-    Xspring_pause,                     FALSE,  FALSE,
-    EL_SPRING,                         -1, -1
+    Xbug_s,                            TRUE,   FALSE,
+    EL_BUG_DOWN,                       -1, -1
   },
   {
-    Xspring_e,                         FALSE,  FALSE,
-    EL_SPRING,                         -1, -1
+    Xbug_w,                            TRUE,   FALSE,
+    EL_BUG_LEFT,                       -1, -1
   },
   {
-    Xspring_w,                         FALSE,  FALSE,
-    EL_SPRING,                         -1, -1
+    Xbug_gon,                          FALSE,  FALSE,
+    EL_BUG_UP,                         -1, -1
   },
   {
-    Xspring_fall,                      FALSE,  FALSE,
-    EL_SPRING,                         -1, -1
+    Xbug_goe,                          FALSE,  FALSE,
+    EL_BUG_RIGHT,                      -1, -1
   },
   {
-    Yspring_s,                         FALSE,  FALSE,
-    EL_SPRING,                         ACTION_FALLING, -1
+    Xbug_gos,                          FALSE,  FALSE,
+    EL_BUG_DOWN,                       -1, -1
   },
   {
-    Yspring_sB,                                FALSE,  TRUE,
-    EL_SPRING,                         ACTION_FALLING, -1
+    Xbug_gow,                          FALSE,  FALSE,
+    EL_BUG_LEFT,                       -1, -1
   },
   {
-    Yspring_e,                         FALSE,  FALSE,
-    EL_SPRING,                         ACTION_MOVING, MV_BIT_RIGHT
+    Ybug_n,                            FALSE,  FALSE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_UP
   },
   {
-    Yspring_eB,                                FALSE,  TRUE,
-    EL_SPRING,                         ACTION_MOVING, MV_BIT_RIGHT
+    Ybug_nB,                           FALSE,  TRUE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_UP
   },
   {
-    Yspring_w,                         FALSE,  FALSE,
-    EL_SPRING,                         ACTION_MOVING, MV_BIT_LEFT
+    Ybug_e,                            FALSE,  FALSE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yspring_wB,                                FALSE,  TRUE,
-    EL_SPRING,                         ACTION_MOVING, MV_BIT_LEFT
+    Ybug_eB,                           FALSE,  TRUE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yspring_kill_e,                    FALSE,  FALSE,
-    EL_SPRING,                         ACTION_EATING, MV_BIT_RIGHT
+    Ybug_s,                            FALSE,  FALSE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Yspring_kill_eB,                   FALSE,  TRUE,
-    EL_SPRING,                         ACTION_EATING, MV_BIT_RIGHT
+    Ybug_sB,                           FALSE,  TRUE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Yspring_kill_w,                    FALSE,  FALSE,
-    EL_SPRING,                         ACTION_EATING, MV_BIT_LEFT
+    Ybug_w,                            FALSE,  FALSE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yspring_kill_wB,                   FALSE,  TRUE,
-    EL_SPRING,                         ACTION_EATING, MV_BIT_LEFT
+    Ybug_wB,                           FALSE,  TRUE,
+    EL_BUG,                            ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xeater_n,                          TRUE,   FALSE,
-    EL_YAMYAM_UP,                      -1, -1
+    Ybug_w_n,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_LEFT, MV_BIT_UP
   },
   {
-    Xeater_e,                          TRUE,   FALSE,
-    EL_YAMYAM_RIGHT,                   -1, -1
+    Ybug_n_e,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_UP, MV_BIT_RIGHT
   },
   {
-    Xeater_w,                          TRUE,   FALSE,
-    EL_YAMYAM_LEFT,                    -1, -1
+    Ybug_e_s,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN
   },
   {
-    Xeater_s,                          TRUE,   FALSE,
-    EL_YAMYAM_DOWN,                    -1, -1
+    Ybug_s_w,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT
   },
   {
-    Yeater_n,                          FALSE,  FALSE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_UP
+    Ybug_e_n,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_RIGHT, MV_BIT_UP
   },
   {
-    Yeater_nB,                         FALSE,  TRUE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_UP
+    Ybug_s_e,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT
   },
   {
-    Yeater_e,                          FALSE,  FALSE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_RIGHT
+    Ybug_w_s,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN
   },
   {
-    Yeater_eB,                         FALSE,  TRUE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_RIGHT
+    Ybug_n_w,                          FALSE,  FALSE,
+    EL_BUG,                            ACTION_TURNING_FROM_UP, MV_BIT_LEFT
   },
   {
-    Yeater_s,                          FALSE,  FALSE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_DOWN
+    Ybug_stone,                                FALSE,  FALSE,
+    EL_BUG,                            ACTION_SMASHED_BY_ROCK, -1
   },
   {
-    Yeater_sB,                         FALSE,  TRUE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_DOWN
+    Ybug_spring,                       FALSE,  FALSE,
+    EL_BUG,                            ACTION_SMASHED_BY_SPRING, -1
   },
   {
-    Yeater_w,                          FALSE,  FALSE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_LEFT
+    Xtank_n,                           TRUE,   FALSE,
+    EL_SPACESHIP_UP,                   -1, -1
   },
   {
-    Yeater_wB,                         FALSE,  TRUE,
-    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_LEFT
+    Xtank_e,                           TRUE,   FALSE,
+    EL_SPACESHIP_RIGHT,                        -1, -1
   },
   {
-    Yeater_stone,                      FALSE,  FALSE,
-    EL_YAMYAM,                         ACTION_SMASHED_BY_ROCK, -1
+    Xtank_s,                           TRUE,   FALSE,
+    EL_SPACESHIP_DOWN,                 -1, -1
   },
   {
-    Yeater_spring,                     FALSE,  FALSE,
-    EL_YAMYAM,                         ACTION_SMASHED_BY_SPRING, -1
+    Xtank_w,                           TRUE,   FALSE,
+    EL_SPACESHIP_LEFT,                 -1, -1
   },
   {
-    Xalien,                            TRUE,   FALSE,
-    EL_ROBOT,                          -1, -1
+    Xtank_gon,                         FALSE,  FALSE,
+    EL_SPACESHIP_UP,                   -1, -1
   },
   {
-    Xalien_pause,                      FALSE,  FALSE,
-    EL_ROBOT,                          -1, -1
+    Xtank_goe,                         FALSE,  FALSE,
+    EL_SPACESHIP_RIGHT,                        -1, -1
   },
   {
-    Yalien_n,                          FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_UP
+    Xtank_gos,                         FALSE,  FALSE,
+    EL_SPACESHIP_DOWN,                 -1, -1
   },
   {
-    Yalien_nB,                         FALSE,  TRUE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_UP
+    Xtank_gow,                         FALSE,  FALSE,
+    EL_SPACESHIP_LEFT,                 -1, -1
   },
   {
-    Yalien_e,                          FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_RIGHT
+    Ytank_n,                           FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_UP
   },
   {
-    Yalien_eB,                         FALSE,  TRUE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_RIGHT
+    Ytank_nB,                          FALSE,  TRUE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_UP
   },
   {
-    Yalien_s,                          FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_DOWN
+    Ytank_e,                           FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yalien_sB,                         FALSE,  TRUE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_DOWN
+    Ytank_eB,                          FALSE,  TRUE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yalien_w,                          FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_LEFT
+    Ytank_s,                           FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Yalien_wB,                         FALSE,  TRUE,
-    EL_ROBOT,                          ACTION_MOVING, MV_BIT_LEFT
+    Ytank_sB,                          FALSE,  TRUE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Yalien_stone,                      FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_SMASHED_BY_ROCK, -1
+    Ytank_w,                           FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yalien_spring,                     FALSE,  FALSE,
-    EL_ROBOT,                          ACTION_SMASHED_BY_SPRING, -1
+    Ytank_wB,                          FALSE,  TRUE,
+    EL_SPACESHIP,                      ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xemerald,                          TRUE,   FALSE,
-    EL_EMERALD,                                -1, -1
+    Ytank_w_n,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_LEFT, MV_BIT_UP
   },
   {
-    Xemerald_pause,                    FALSE,  FALSE,
-    EL_EMERALD,                                -1, -1
+    Ytank_n_e,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_UP, MV_BIT_RIGHT
   },
   {
-    Xemerald_fall,                     FALSE,  FALSE,
-    EL_EMERALD,                                -1, -1
+    Ytank_e_s,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_RIGHT, MV_BIT_DOWN
   },
   {
-    Xemerald_shine,                    FALSE,  FALSE,
-    EL_EMERALD,                                ACTION_TWINKLING, -1
+    Ytank_s_w,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_DOWN, MV_BIT_LEFT
   },
   {
-    Yemerald_s,                                FALSE,  FALSE,
-    EL_EMERALD,                                ACTION_FALLING, -1
+    Ytank_e_n,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_RIGHT, MV_BIT_UP
   },
   {
-    Yemerald_sB,                       FALSE,  TRUE,
-    EL_EMERALD,                                ACTION_FALLING, -1
+    Ytank_s_e,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_DOWN, MV_BIT_RIGHT
   },
   {
-    Yemerald_e,                                FALSE,  FALSE,
-    EL_EMERALD,                                ACTION_MOVING, MV_BIT_RIGHT
+    Ytank_w_s,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_LEFT, MV_BIT_DOWN
   },
   {
-    Yemerald_eB,                       FALSE,  TRUE,
-    EL_EMERALD,                                ACTION_MOVING, MV_BIT_RIGHT
+    Ytank_n_w,                         FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_TURNING_FROM_UP, MV_BIT_LEFT
   },
   {
-    Yemerald_w,                                FALSE,  FALSE,
-    EL_EMERALD,                                ACTION_MOVING, MV_BIT_LEFT
+    Ytank_stone,                       FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_SMASHED_BY_ROCK, -1
   },
   {
-    Yemerald_wB,                       FALSE,  TRUE,
-    EL_EMERALD,                                ACTION_MOVING, MV_BIT_LEFT
+    Ytank_spring,                      FALSE,  FALSE,
+    EL_SPACESHIP,                      ACTION_SMASHED_BY_SPRING, -1
   },
   {
-    Yemerald_eat,                      FALSE,  FALSE,
-    EL_EMERALD,                                ACTION_COLLECTING, -1
+    Xandroid,                          TRUE,   FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, -1
   },
   {
-    Yemerald_stone,                    FALSE,  FALSE,
-    EL_NUT,                            ACTION_BREAKING, -1
+    Xandroid_1_n,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_UP
   },
   {
-    Xdiamond,                          TRUE,   FALSE,
-    EL_DIAMOND,                                -1, -1
+    Xandroid_2_n,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_UP
   },
   {
-    Xdiamond_pause,                    FALSE,  FALSE,
-    EL_DIAMOND,                                -1, -1
+    Xandroid_1_e,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_RIGHT
   },
   {
-    Xdiamond_fall,                     FALSE,  FALSE,
-    EL_DIAMOND,                                -1, -1
+    Xandroid_2_e,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_RIGHT
   },
   {
-    Xdiamond_shine,                    FALSE,  FALSE,
-    EL_DIAMOND,                                ACTION_TWINKLING, -1
+    Xandroid_1_w,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_LEFT
   },
   {
-    Ydiamond_s,                                FALSE,  FALSE,
-    EL_DIAMOND,                                ACTION_FALLING, -1
+    Xandroid_2_w,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_LEFT
   },
   {
-    Ydiamond_sB,                       FALSE,  TRUE,
-    EL_DIAMOND,                                ACTION_FALLING, -1
+    Xandroid_1_s,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_DOWN
   },
   {
-    Ydiamond_e,                                FALSE,  FALSE,
-    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_RIGHT
+    Xandroid_2_s,                      FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_ACTIVE, MV_BIT_DOWN
   },
   {
-    Ydiamond_eB,                       FALSE,  TRUE,
-    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_RIGHT
+    Yandroid_n,                                FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_UP
   },
   {
-    Ydiamond_w,                                FALSE,  FALSE,
-    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_LEFT
+    Yandroid_nB,                       FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_UP
   },
   {
-    Ydiamond_wB,                       FALSE,  TRUE,
-    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_LEFT
+    Yandroid_ne,                       FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_UPRIGHT
   },
   {
-    Ydiamond_eat,                      FALSE,  FALSE,
-    EL_DIAMOND,                                ACTION_COLLECTING, -1
+    Yandroid_neB,                      FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_UPRIGHT
   },
   {
-    Ydiamond_stone,                    FALSE,  FALSE,
-    EL_DIAMOND,                                ACTION_SMASHED_BY_ROCK, -1
+    Yandroid_e,                                FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xdrip_fall,                                TRUE,   FALSE,
-    EL_AMOEBA_DROP,                    -1, -1
+    Yandroid_eB,                       FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xdrip_stretch,                     FALSE,  FALSE,
-    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
+    Yandroid_se,                       FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_DOWNRIGHT
   },
   {
-    Xdrip_stretchB,                    FALSE,  TRUE,
-    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
+    Yandroid_seB,                      FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_DOWNRIGHT
   },
   {
-    Xdrip_eat,                         FALSE,  FALSE,
-    EL_AMOEBA_DROP,                    ACTION_GROWING, -1
+    Yandroid_s,                                FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Ydrip_s1,                          FALSE,  FALSE,
-    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
+    Yandroid_sB,                       FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Ydrip_s1B,                         FALSE,  TRUE,
-    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
+    Yandroid_sw,                       FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_DOWNLEFT
   },
   {
-    Ydrip_s2,                          FALSE,  FALSE,
-    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
+    Yandroid_swB,                      FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_DOWNLEFT
   },
   {
-    Ydrip_s2B,                         FALSE,  TRUE,
-    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
+    Yandroid_w,                                FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xbomb,                             TRUE,   FALSE,
-    EL_BOMB,                           -1, -1
+    Yandroid_wB,                       FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xbomb_pause,                       FALSE,  FALSE,
-    EL_BOMB,                           -1, -1
+    Yandroid_nw,                       FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_GROWING, MV_BIT_UPLEFT
   },
   {
-    Xbomb_fall,                                FALSE,  FALSE,
-    EL_BOMB,                           -1, -1
+    Yandroid_nwB,                      FALSE,  TRUE,
+    EL_EMC_ANDROID,                    ACTION_SHRINKING, MV_BIT_UPLEFT
   },
   {
-    Ybomb_s,                           FALSE,  FALSE,
-    EL_BOMB,                           ACTION_FALLING, -1
+    Xspring,                           TRUE,   FALSE,
+    EL_SPRING,                         -1, -1
   },
   {
-    Ybomb_sB,                          FALSE,  TRUE,
-    EL_BOMB,                           ACTION_FALLING, -1
+    Xspring_pause,                     FALSE,  FALSE,
+    EL_SPRING,                         -1, -1
   },
   {
-    Ybomb_e,                           FALSE,  FALSE,
-    EL_BOMB,                           ACTION_MOVING, MV_BIT_RIGHT
+    Xspring_e,                         FALSE,  FALSE,
+    EL_SPRING,                         -1, -1
   },
   {
-    Ybomb_eB,                          FALSE,  TRUE,
-    EL_BOMB,                           ACTION_MOVING, MV_BIT_RIGHT
+    Xspring_w,                         FALSE,  FALSE,
+    EL_SPRING,                         -1, -1
   },
   {
-    Ybomb_w,                           FALSE,  FALSE,
-    EL_BOMB,                           ACTION_MOVING, MV_BIT_LEFT
+    Xspring_fall,                      FALSE,  FALSE,
+    EL_SPRING,                         -1, -1
   },
   {
-    Ybomb_wB,                          FALSE,  TRUE,
-    EL_BOMB,                           ACTION_MOVING, MV_BIT_LEFT
+    Yspring_s,                         FALSE,  FALSE,
+    EL_SPRING,                         ACTION_FALLING, -1
   },
   {
-    Ybomb_eat,                         FALSE,  FALSE,
-    EL_BOMB,                           ACTION_ACTIVATING, -1
+    Yspring_sB,                                FALSE,  TRUE,
+    EL_SPRING,                         ACTION_FALLING, -1
   },
   {
-    Xballoon,                          TRUE,   FALSE,
-    EL_BALLOON,                                -1, -1
+    Yspring_e,                         FALSE,  FALSE,
+    EL_SPRING,                         ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yballoon_n,                                FALSE,  FALSE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_UP
+    Yspring_eB,                                FALSE,  TRUE,
+    EL_SPRING,                         ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Yballoon_nB,                       FALSE,  TRUE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_UP
+    Yspring_w,                         FALSE,  FALSE,
+    EL_SPRING,                         ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yballoon_e,                                FALSE,  FALSE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_RIGHT
+    Yspring_wB,                                FALSE,  TRUE,
+    EL_SPRING,                         ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Yballoon_eB,                       FALSE,  TRUE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_RIGHT
+    Yspring_kill_e,                    FALSE,  FALSE,
+    EL_SPRING,                         ACTION_EATING, MV_BIT_RIGHT
   },
   {
-    Yballoon_s,                                FALSE,  FALSE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_DOWN
+    Yspring_kill_eB,                   FALSE,  TRUE,
+    EL_SPRING,                         ACTION_EATING, MV_BIT_RIGHT
   },
   {
-    Yballoon_sB,                       FALSE,  TRUE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_DOWN
+    Yspring_kill_w,                    FALSE,  FALSE,
+    EL_SPRING,                         ACTION_EATING, MV_BIT_LEFT
   },
   {
-    Yballoon_w,                                FALSE,  FALSE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_LEFT
+    Yspring_kill_wB,                   FALSE,  TRUE,
+    EL_SPRING,                         ACTION_EATING, MV_BIT_LEFT
   },
   {
-    Yballoon_wB,                       FALSE,  TRUE,
-    EL_BALLOON,                                ACTION_MOVING, MV_BIT_LEFT
+    Xeater_n,                          TRUE,   FALSE,
+    EL_YAMYAM_UP,                      -1, -1
   },
   {
-    Xgrass,                            TRUE,   FALSE,
-    EL_EMC_GRASS,                      -1, -1
+    Xeater_e,                          TRUE,   FALSE,
+    EL_YAMYAM_RIGHT,                   -1, -1
   },
   {
-    Ygrass_nB,                         FALSE,  FALSE,
-    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_UP
+    Xeater_w,                          TRUE,   FALSE,
+    EL_YAMYAM_LEFT,                    -1, -1
   },
   {
-    Ygrass_eB,                         FALSE,  FALSE,
-    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_RIGHT
+    Xeater_s,                          TRUE,   FALSE,
+    EL_YAMYAM_DOWN,                    -1, -1
   },
   {
-    Ygrass_sB,                         FALSE,  FALSE,
-    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_DOWN
+    Yeater_n,                          FALSE,  FALSE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_UP
   },
   {
-    Ygrass_wB,                         FALSE,  FALSE,
-    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_LEFT
+    Yeater_nB,                         FALSE,  TRUE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_UP
   },
   {
-    Xdirt,                             TRUE,   FALSE,
-    EL_SAND,                           -1, -1
+    Yeater_e,                          FALSE,  FALSE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Ydirt_nB,                          FALSE,  FALSE,
-    EL_SAND,                           ACTION_DIGGING, MV_BIT_UP
+    Yeater_eB,                         FALSE,  TRUE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Ydirt_eB,                          FALSE,  FALSE,
-    EL_SAND,                           ACTION_DIGGING, MV_BIT_RIGHT
+    Yeater_s,                          FALSE,  FALSE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Ydirt_sB,                          FALSE,  FALSE,
-    EL_SAND,                           ACTION_DIGGING, MV_BIT_DOWN
+    Yeater_sB,                         FALSE,  TRUE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Ydirt_wB,                          FALSE,  FALSE,
-    EL_SAND,                           ACTION_DIGGING, MV_BIT_LEFT
+    Yeater_w,                          FALSE,  FALSE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xacid_ne,                          TRUE,   FALSE,
-    EL_ACID_POOL_TOPRIGHT,             -1, -1
+    Yeater_wB,                         FALSE,  TRUE,
+    EL_YAMYAM,                         ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xacid_se,                          TRUE,   FALSE,
-    EL_ACID_POOL_BOTTOMRIGHT,          -1, -1
+    Yeater_stone,                      FALSE,  FALSE,
+    EL_YAMYAM,                         ACTION_SMASHED_BY_ROCK, -1
   },
   {
-    Xacid_s,                           TRUE,   FALSE,
-    EL_ACID_POOL_BOTTOM,               -1, -1
+    Yeater_spring,                     FALSE,  FALSE,
+    EL_YAMYAM,                         ACTION_SMASHED_BY_SPRING, -1
   },
   {
-    Xacid_sw,                          TRUE,   FALSE,
-    EL_ACID_POOL_BOTTOMLEFT,           -1, -1
+    Xalien,                            TRUE,   FALSE,
+    EL_ROBOT,                          -1, -1
   },
   {
-    Xacid_nw,                          TRUE,   FALSE,
-    EL_ACID_POOL_TOPLEFT,              -1, -1
+    Xalien_pause,                      FALSE,  FALSE,
+    EL_ROBOT,                          -1, -1
   },
   {
-    Xacid_1,                           TRUE,   FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_n,                          FALSE,  FALSE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_UP
   },
   {
-    Xacid_2,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_nB,                         FALSE,  TRUE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_UP
   },
   {
-    Xacid_3,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_e,                          FALSE,  FALSE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xacid_4,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_eB,                         FALSE,  TRUE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xacid_5,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_s,                          FALSE,  FALSE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Xacid_6,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_sB,                         FALSE,  TRUE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Xacid_7,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_w,                          FALSE,  FALSE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xacid_8,                           FALSE,  FALSE,
-    EL_ACID,                           -1, -1
+    Yalien_wB,                         FALSE,  TRUE,
+    EL_ROBOT,                          ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xball_1,                           TRUE,   FALSE,
-    EL_EMC_MAGIC_BALL,                 -1, -1
+    Yalien_stone,                      FALSE,  FALSE,
+    EL_ROBOT,                          ACTION_SMASHED_BY_ROCK, -1
   },
   {
-    Xball_1B,                          FALSE,  FALSE,
-    EL_EMC_MAGIC_BALL,                 ACTION_ACTIVE, -1
+    Yalien_spring,                     FALSE,  FALSE,
+    EL_ROBOT,                          ACTION_SMASHED_BY_SPRING, -1
   },
   {
-    Xball_2,                           FALSE,  FALSE,
-    EL_EMC_MAGIC_BALL,                 ACTION_ACTIVE, -1
+    Xemerald,                          TRUE,   FALSE,
+    EL_EMERALD,                                -1, -1
   },
   {
-    Xball_2B,                          FALSE,  FALSE,
-    EL_EMC_MAGIC_BALL,                 ACTION_ACTIVE, -1
+    Xemerald_pause,                    FALSE,  FALSE,
+    EL_EMERALD,                                -1, -1
   },
   {
-    Yball_eat,                         FALSE,  FALSE,
-    EL_EMC_MAGIC_BALL,                 ACTION_DROPPING, -1
+    Xemerald_fall,                     FALSE,  FALSE,
+    EL_EMERALD,                                -1, -1
   },
   {
-    Ykey_1_eat,                                FALSE,  FALSE,
-    EL_EM_KEY_1,                       ACTION_COLLECTING, -1
+    Xemerald_shine,                    FALSE,  FALSE,
+    EL_EMERALD,                                ACTION_TWINKLING, -1
   },
   {
-    Ykey_2_eat,                                FALSE,  FALSE,
-    EL_EM_KEY_2,                       ACTION_COLLECTING, -1
+    Yemerald_s,                                FALSE,  FALSE,
+    EL_EMERALD,                                ACTION_FALLING, -1
   },
   {
-    Ykey_3_eat,                                FALSE,  FALSE,
-    EL_EM_KEY_3,                       ACTION_COLLECTING, -1
+    Yemerald_sB,                       FALSE,  TRUE,
+    EL_EMERALD,                                ACTION_FALLING, -1
   },
   {
-    Ykey_4_eat,                                FALSE,  FALSE,
-    EL_EM_KEY_4,                       ACTION_COLLECTING, -1
+    Yemerald_e,                                FALSE,  FALSE,
+    EL_EMERALD,                                ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Ykey_5_eat,                                FALSE,  FALSE,
-    EL_EMC_KEY_5,                      ACTION_COLLECTING, -1
+    Yemerald_eB,                       FALSE,  TRUE,
+    EL_EMERALD,                                ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Ykey_6_eat,                                FALSE,  FALSE,
-    EL_EMC_KEY_6,                      ACTION_COLLECTING, -1
+    Yemerald_w,                                FALSE,  FALSE,
+    EL_EMERALD,                                ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Ykey_7_eat,                                FALSE,  FALSE,
-    EL_EMC_KEY_7,                      ACTION_COLLECTING, -1
+    Yemerald_wB,                       FALSE,  TRUE,
+    EL_EMERALD,                                ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Ykey_8_eat,                                FALSE,  FALSE,
-    EL_EMC_KEY_8,                      ACTION_COLLECTING, -1
+    Yemerald_eat,                      FALSE,  FALSE,
+    EL_EMERALD,                                ACTION_COLLECTING, -1
   },
   {
-    Ylenses_eat,                       FALSE,  FALSE,
-    EL_EMC_LENSES,                     ACTION_COLLECTING, -1
+    Yemerald_stone,                    FALSE,  FALSE,
+    EL_NUT,                            ACTION_BREAKING, -1
   },
   {
-    Ymagnify_eat,                      FALSE,  FALSE,
-    EL_EMC_MAGNIFIER,                  ACTION_COLLECTING, -1
+    Xdiamond,                          TRUE,   FALSE,
+    EL_DIAMOND,                                -1, -1
   },
   {
-    Ygrass_eat,                                FALSE,  FALSE,
-    EL_EMC_GRASS,                      ACTION_SNAPPING, -1
+    Xdiamond_pause,                    FALSE,  FALSE,
+    EL_DIAMOND,                                -1, -1
   },
   {
-    Ydirt_eat,                         FALSE,  FALSE,
-    EL_SAND,                           ACTION_SNAPPING, -1
+    Xdiamond_fall,                     FALSE,  FALSE,
+    EL_DIAMOND,                                -1, -1
   },
   {
-    Xgrow_ns,                          TRUE,   FALSE,
-    EL_EXPANDABLE_WALL_VERTICAL,       -1, -1
+    Xdiamond_shine,                    FALSE,  FALSE,
+    EL_DIAMOND,                                ACTION_TWINKLING, -1
   },
   {
-    Ygrow_ns_eat,                      FALSE,  FALSE,
-    EL_EXPANDABLE_WALL_VERTICAL,       ACTION_GROWING, -1
+    Ydiamond_s,                                FALSE,  FALSE,
+    EL_DIAMOND,                                ACTION_FALLING, -1
   },
   {
-    Xgrow_ew,                          TRUE,   FALSE,
-    EL_EXPANDABLE_WALL_HORIZONTAL,     -1, -1
+    Ydiamond_sB,                       FALSE,  TRUE,
+    EL_DIAMOND,                                ACTION_FALLING, -1
   },
   {
-    Ygrow_ew_eat,                      FALSE,  FALSE,
-    EL_EXPANDABLE_WALL_HORIZONTAL,     ACTION_GROWING, -1
+    Ydiamond_e,                                FALSE,  FALSE,
+    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xwonderwall,                       TRUE,   FALSE,
-    EL_MAGIC_WALL,                     -1, -1
+    Ydiamond_eB,                       FALSE,  TRUE,
+    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_RIGHT
   },
-  {
-    XwonderwallB,                      FALSE,  FALSE,
-    EL_MAGIC_WALL,                     ACTION_ACTIVE, -1
+  {
+    Ydiamond_w,                                FALSE,  FALSE,
+    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xamoeba_1,                         TRUE,   FALSE,
-    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
+    Ydiamond_wB,                       FALSE,  TRUE,
+    EL_DIAMOND,                                ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xamoeba_2,                         FALSE,  FALSE,
-    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
+    Ydiamond_eat,                      FALSE,  FALSE,
+    EL_DIAMOND,                                ACTION_COLLECTING, -1
   },
   {
-    Xamoeba_3,                         FALSE,  FALSE,
-    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
+    Ydiamond_stone,                    FALSE,  FALSE,
+    EL_DIAMOND,                                ACTION_SMASHED_BY_ROCK, -1
   },
   {
-    Xamoeba_4,                         FALSE,  FALSE,
-    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
+    Xdrip_fall,                                TRUE,   FALSE,
+    EL_AMOEBA_DROP,                    -1, -1
   },
   {
-    Xamoeba_5,                         TRUE,   FALSE,
-    EL_AMOEBA_WET,                     ACTION_OTHER, -1
+    Xdrip_stretch,                     FALSE,  FALSE,
+    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
   },
   {
-    Xamoeba_6,                         FALSE,  FALSE,
-    EL_AMOEBA_WET,                     ACTION_OTHER, -1
+    Xdrip_stretchB,                    FALSE,  TRUE,
+    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
   },
   {
-    Xamoeba_7,                         FALSE,  FALSE,
-    EL_AMOEBA_WET,                     ACTION_OTHER, -1
+    Xdrip_eat,                         FALSE,  FALSE,
+    EL_AMOEBA_DROP,                    ACTION_GROWING, -1
   },
   {
-    Xamoeba_8,                         FALSE,  FALSE,
-    EL_AMOEBA_WET,                     ACTION_OTHER, -1
+    Ydrip_s1,                          FALSE,  FALSE,
+    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
   },
   {
-    Xdoor_1,                           TRUE,   FALSE,
-    EL_EM_GATE_1,                      -1, -1
+    Ydrip_s1B,                         FALSE,  TRUE,
+    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
   },
   {
-    Xdoor_2,                           TRUE,   FALSE,
-    EL_EM_GATE_2,                      -1, -1
+    Ydrip_s2,                          FALSE,  FALSE,
+    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
   },
   {
-    Xdoor_3,                           TRUE,   FALSE,
-    EL_EM_GATE_3,                      -1, -1
+    Ydrip_s2B,                         FALSE,  TRUE,
+    EL_AMOEBA_DROP,                    ACTION_FALLING, -1
   },
   {
-    Xdoor_4,                           TRUE,   FALSE,
-    EL_EM_GATE_4,                      -1, -1
+    Xbomb,                             TRUE,   FALSE,
+    EL_BOMB,                           -1, -1
   },
   {
-    Xdoor_5,                           TRUE,   FALSE,
-    EL_EMC_GATE_5,                     -1, -1
+    Xbomb_pause,                       FALSE,  FALSE,
+    EL_BOMB,                           -1, -1
   },
   {
-    Xdoor_6,                           TRUE,   FALSE,
-    EL_EMC_GATE_6,                     -1, -1
+    Xbomb_fall,                                FALSE,  FALSE,
+    EL_BOMB,                           -1, -1
   },
   {
-    Xdoor_7,                           TRUE,   FALSE,
-    EL_EMC_GATE_7,                     -1, -1
+    Ybomb_s,                           FALSE,  FALSE,
+    EL_BOMB,                           ACTION_FALLING, -1
   },
   {
-    Xdoor_8,                           TRUE,   FALSE,
-    EL_EMC_GATE_8,                     -1, -1
+    Ybomb_sB,                          FALSE,  TRUE,
+    EL_BOMB,                           ACTION_FALLING, -1
   },
   {
-    Xkey_1,                            TRUE,   FALSE,
-    EL_EM_KEY_1,                       -1, -1
+    Ybomb_e,                           FALSE,  FALSE,
+    EL_BOMB,                           ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xkey_2,                            TRUE,   FALSE,
-    EL_EM_KEY_2,                       -1, -1
+    Ybomb_eB,                          FALSE,  TRUE,
+    EL_BOMB,                           ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xkey_3,                            TRUE,   FALSE,
-    EL_EM_KEY_3,                       -1, -1
+    Ybomb_w,                           FALSE,  FALSE,
+    EL_BOMB,                           ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xkey_4,                            TRUE,   FALSE,
-    EL_EM_KEY_4,                       -1, -1
+    Ybomb_wB,                          FALSE,  TRUE,
+    EL_BOMB,                           ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xkey_5,                            TRUE,   FALSE,
-    EL_EMC_KEY_5,                      -1, -1
+    Ybomb_eat,                         FALSE,  FALSE,
+    EL_BOMB,                           ACTION_ACTIVATING, -1
   },
   {
-    Xkey_6,                            TRUE,   FALSE,
-    EL_EMC_KEY_6,                      -1, -1
+    Xballoon,                          TRUE,   FALSE,
+    EL_BALLOON,                                -1, -1
   },
   {
-    Xkey_7,                            TRUE,   FALSE,
-    EL_EMC_KEY_7,                      -1, -1
+    Yballoon_n,                                FALSE,  FALSE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_UP
   },
   {
-    Xkey_8,                            TRUE,   FALSE,
-    EL_EMC_KEY_8,                      -1, -1
+    Yballoon_nB,                       FALSE,  TRUE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_UP
   },
   {
-    Xwind_n,                           TRUE,   FALSE,
-    EL_BALLOON_SWITCH_UP,              -1, -1
+    Yballoon_e,                                FALSE,  FALSE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xwind_e,                           TRUE,   FALSE,
-    EL_BALLOON_SWITCH_RIGHT,           -1, -1
+    Yballoon_eB,                       FALSE,  TRUE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_RIGHT
   },
   {
-    Xwind_s,                           TRUE,   FALSE,
-    EL_BALLOON_SWITCH_DOWN,            -1, -1
+    Yballoon_s,                                FALSE,  FALSE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Xwind_w,                           TRUE,   FALSE,
-    EL_BALLOON_SWITCH_LEFT,            -1, -1
+    Yballoon_sB,                       FALSE,  TRUE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_DOWN
   },
   {
-    Xwind_nesw,                                TRUE,   FALSE,
-    EL_BALLOON_SWITCH_ANY,             -1, -1
+    Yballoon_w,                                FALSE,  FALSE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xwind_stop,                                TRUE,   FALSE,
-    EL_BALLOON_SWITCH_NONE,            -1, -1
+    Yballoon_wB,                       FALSE,  TRUE,
+    EL_BALLOON,                                ACTION_MOVING, MV_BIT_LEFT
   },
   {
-    Xexit,                             TRUE,   FALSE,
-    EL_EM_EXIT_CLOSED,                 -1, -1
+    Xgrass,                            TRUE,   FALSE,
+    EL_EMC_GRASS,                      -1, -1
   },
   {
-    Xexit_1,                           TRUE,   FALSE,
-    EL_EM_EXIT_OPEN,                   -1, -1
+    Ygrass_nB,                         FALSE,  FALSE,
+    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_UP
   },
   {
-    Xexit_2,                           FALSE,  FALSE,
-    EL_EM_EXIT_OPEN,                   -1, -1
+    Ygrass_eB,                         FALSE,  FALSE,
+    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_RIGHT
   },
   {
-    Xexit_3,                           FALSE,  FALSE,
-    EL_EM_EXIT_OPEN,                   -1, -1
+    Ygrass_sB,                         FALSE,  FALSE,
+    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_DOWN
   },
   {
-    Xdynamite,                         TRUE,   FALSE,
-    EL_EM_DYNAMITE,                    -1, -1
+    Ygrass_wB,                         FALSE,  FALSE,
+    EL_EMC_GRASS,                      ACTION_DIGGING, MV_BIT_LEFT
   },
   {
-    Ydynamite_eat,                     FALSE,  FALSE,
-    EL_EM_DYNAMITE,                    ACTION_COLLECTING, -1
+    Xdirt,                             TRUE,   FALSE,
+    EL_SAND,                           -1, -1
   },
   {
-    Xdynamite_1,                       TRUE,   FALSE,
-    EL_EM_DYNAMITE_ACTIVE,             -1, -1
+    Ydirt_nB,                          FALSE,  FALSE,
+    EL_SAND,                           ACTION_DIGGING, MV_BIT_UP
   },
   {
-    Xdynamite_2,                       FALSE,  FALSE,
-    EL_EM_DYNAMITE_ACTIVE,             -1, -1
+    Ydirt_eB,                          FALSE,  FALSE,
+    EL_SAND,                           ACTION_DIGGING, MV_BIT_RIGHT
   },
   {
-    Xdynamite_3,                       FALSE,  FALSE,
-    EL_EM_DYNAMITE_ACTIVE,             -1, -1
+    Ydirt_sB,                          FALSE,  FALSE,
+    EL_SAND,                           ACTION_DIGGING, MV_BIT_DOWN
   },
   {
-    Xdynamite_4,                       FALSE,  FALSE,
-    EL_EM_DYNAMITE_ACTIVE,             -1, -1
+    Ydirt_wB,                          FALSE,  FALSE,
+    EL_SAND,                           ACTION_DIGGING, MV_BIT_LEFT
   },
   {
-    Xbumper,                           TRUE,   FALSE,
-    EL_EMC_SPRING_BUMPER,              -1, -1
+    Xacid_ne,                          TRUE,   FALSE,
+    EL_ACID_POOL_TOPRIGHT,             -1, -1
   },
   {
-    XbumperB,                          FALSE,  FALSE,
-    EL_EMC_SPRING_BUMPER,              ACTION_ACTIVE, -1
+    Xacid_se,                          TRUE,   FALSE,
+    EL_ACID_POOL_BOTTOMRIGHT,          -1, -1
   },
   {
-    Xwheel,                            TRUE,   FALSE,
-    EL_ROBOT_WHEEL,                    -1, -1
+    Xacid_s,                           TRUE,   FALSE,
+    EL_ACID_POOL_BOTTOM,               -1, -1
   },
   {
-    XwheelB,                           FALSE,  FALSE,
-    EL_ROBOT_WHEEL,                    ACTION_ACTIVE, -1
+    Xacid_sw,                          TRUE,   FALSE,
+    EL_ACID_POOL_BOTTOMLEFT,           -1, -1
   },
   {
-    Xswitch,                           TRUE,   FALSE,
-    EL_EMC_MAGIC_BALL_SWITCH,          -1, -1
+    Xacid_nw,                          TRUE,   FALSE,
+    EL_ACID_POOL_TOPLEFT,              -1, -1
   },
   {
-    XswitchB,                          FALSE,  FALSE,
-    EL_EMC_MAGIC_BALL_SWITCH,          ACTION_ACTIVE, -1
+    Xacid_1,                           TRUE,   FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand,                             TRUE,   FALSE,
-    EL_QUICKSAND_EMPTY,                        -1, -1
+    Xacid_2,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand_stone,                       TRUE,   FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Xacid_3,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand_stonein_1,                   FALSE,  TRUE,
-    EL_ROCK,                           ACTION_FILLING, -1
+    Xacid_4,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand_stonein_2,                   FALSE,  TRUE,
-    EL_ROCK,                           ACTION_FILLING, -1
+    Xacid_5,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand_stonein_3,                   FALSE,  TRUE,
-    EL_ROCK,                           ACTION_FILLING, -1
+    Xacid_6,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand_stonein_4,                   FALSE,  TRUE,
-    EL_ROCK,                           ACTION_FILLING, -1
+    Xacid_7,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
-#if 1
   {
-    Xsand_stonesand_1,                 FALSE,  FALSE,
-    EL_QUICKSAND_EMPTYING,             -1, -1
+    Xacid_8,                           FALSE,  FALSE,
+    EL_ACID,                           -1, -1
   },
   {
-    Xsand_stonesand_2,                 FALSE,  FALSE,
-    EL_QUICKSAND_EMPTYING,             -1, -1
+    Xball_1,                           TRUE,   FALSE,
+    EL_EMC_MAGIC_BALL,                 -1, -1
   },
   {
-    Xsand_stonesand_3,                 FALSE,  FALSE,
-    EL_QUICKSAND_EMPTYING,             -1, -1
+    Xball_1B,                          FALSE,  FALSE,
+    EL_EMC_MAGIC_BALL,                 ACTION_ACTIVE, -1
   },
   {
-    Xsand_stonesand_4,                 FALSE,  FALSE,
-    EL_QUICKSAND_EMPTYING,             -1, -1
+    Xball_2,                           FALSE,  FALSE,
+    EL_EMC_MAGIC_BALL,                 ACTION_ACTIVE, -1
   },
   {
-    Xsand_stonesand_quickout_1,                FALSE,  FALSE,
-    EL_QUICKSAND_EMPTYING,             -1, -1
+    Xball_2B,                          FALSE,  FALSE,
+    EL_EMC_MAGIC_BALL,                 ACTION_ACTIVE, -1
   },
   {
-    Xsand_stonesand_quickout_2,                FALSE,  FALSE,
-    EL_QUICKSAND_EMPTYING,             -1, -1
+    Yball_eat,                         FALSE,  FALSE,
+    EL_EMC_MAGIC_BALL,                 ACTION_DROPPING, -1
   },
-#else
   {
-    Xsand_stonesand_1,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ykey_1_eat,                                FALSE,  FALSE,
+    EL_EM_KEY_1,                       ACTION_COLLECTING, -1
   },
   {
-    Xsand_stonesand_2,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ykey_2_eat,                                FALSE,  FALSE,
+    EL_EM_KEY_2,                       ACTION_COLLECTING, -1
   },
   {
-    Xsand_stonesand_3,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ykey_3_eat,                                FALSE,  FALSE,
+    EL_EM_KEY_3,                       ACTION_COLLECTING, -1
   },
   {
-    Xsand_stonesand_4,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ykey_4_eat,                                FALSE,  FALSE,
+    EL_EM_KEY_4,                       ACTION_COLLECTING, -1
   },
-#endif
   {
-    Xsand_stoneout_1,                  FALSE,  FALSE,
-    EL_ROCK,                           ACTION_EMPTYING, -1
+    Ykey_5_eat,                                FALSE,  FALSE,
+    EL_EMC_KEY_5,                      ACTION_COLLECTING, -1
   },
   {
-    Xsand_stoneout_2,                  FALSE,  FALSE,
-    EL_ROCK,                           ACTION_EMPTYING, -1
+    Ykey_6_eat,                                FALSE,  FALSE,
+    EL_EMC_KEY_6,                      ACTION_COLLECTING, -1
   },
-#if 1
   {
-    Xsand_sandstone_1,                 FALSE,  FALSE,
-    EL_QUICKSAND_FILLING,              -1, -1
+    Ykey_7_eat,                                FALSE,  FALSE,
+    EL_EMC_KEY_7,                      ACTION_COLLECTING, -1
   },
   {
-    Xsand_sandstone_2,                 FALSE,  FALSE,
-    EL_QUICKSAND_FILLING,              -1, -1
+    Ykey_8_eat,                                FALSE,  FALSE,
+    EL_EMC_KEY_8,                      ACTION_COLLECTING, -1
   },
   {
-    Xsand_sandstone_3,                 FALSE,  FALSE,
-    EL_QUICKSAND_FILLING,              -1, -1
+    Ylenses_eat,                       FALSE,  FALSE,
+    EL_EMC_LENSES,                     ACTION_COLLECTING, -1
   },
   {
-    Xsand_sandstone_4,                 FALSE,  FALSE,
-    EL_QUICKSAND_FILLING,              -1, -1
+    Ymagnify_eat,                      FALSE,  FALSE,
+    EL_EMC_MAGNIFIER,                  ACTION_COLLECTING, -1
   },
-#else
   {
-    Xsand_sandstone_1,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ygrass_eat,                                FALSE,  FALSE,
+    EL_EMC_GRASS,                      ACTION_SNAPPING, -1
   },
   {
-    Xsand_sandstone_2,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ydirt_eat,                         FALSE,  FALSE,
+    EL_SAND,                           ACTION_SNAPPING, -1
   },
   {
-    Xsand_sandstone_3,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Xgrow_ns,                          TRUE,   FALSE,
+    EL_EXPANDABLE_WALL_VERTICAL,       -1, -1
   },
   {
-    Xsand_sandstone_4,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
+    Ygrow_ns_eat,                      FALSE,  FALSE,
+    EL_EXPANDABLE_WALL_VERTICAL,       ACTION_GROWING, -1
   },
-#endif
   {
-    Xplant,                            TRUE,   FALSE,
-    EL_EMC_PLANT,                      -1, -1
+    Xgrow_ew,                          TRUE,   FALSE,
+    EL_EXPANDABLE_WALL_HORIZONTAL,     -1, -1
   },
   {
-    Yplant,                            FALSE,  FALSE,
-    EL_EMC_PLANT,                      -1, -1
+    Ygrow_ew_eat,                      FALSE,  FALSE,
+    EL_EXPANDABLE_WALL_HORIZONTAL,     ACTION_GROWING, -1
   },
   {
-    Xlenses,                           TRUE,   FALSE,
-    EL_EMC_LENSES,                     -1, -1
+    Xwonderwall,                       TRUE,   FALSE,
+    EL_MAGIC_WALL,                     -1, -1
   },
   {
-    Xmagnify,                          TRUE,   FALSE,
-    EL_EMC_MAGNIFIER,                  -1, -1
+    XwonderwallB,                      FALSE,  FALSE,
+    EL_MAGIC_WALL,                     ACTION_ACTIVE, -1
   },
   {
-    Xdripper,                          TRUE,   FALSE,
-    EL_EMC_DRIPPER,                    -1, -1
+    Xamoeba_1,                         TRUE,   FALSE,
+    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
   },
   {
-    XdripperB,                         FALSE,  FALSE,
-    EL_EMC_DRIPPER,                    ACTION_ACTIVE, -1
+    Xamoeba_2,                         FALSE,  FALSE,
+    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
   },
   {
-    Xfake_blank,                       TRUE,   FALSE,
-    EL_INVISIBLE_WALL,                 -1, -1
+    Xamoeba_3,                         FALSE,  FALSE,
+    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
   },
   {
-    Xfake_blankB,                      FALSE,  FALSE,
-    EL_INVISIBLE_WALL,                 ACTION_ACTIVE, -1
+    Xamoeba_4,                         FALSE,  FALSE,
+    EL_AMOEBA_DRY,                     ACTION_OTHER, -1
   },
   {
-    Xfake_grass,                       TRUE,   FALSE,
-    EL_EMC_FAKE_GRASS,                 -1, -1
+    Xamoeba_5,                         TRUE,   FALSE,
+    EL_AMOEBA_WET,                     ACTION_OTHER, -1
   },
   {
-    Xfake_grassB,                      FALSE,  FALSE,
-    EL_EMC_FAKE_GRASS,                 ACTION_ACTIVE, -1
+    Xamoeba_6,                         FALSE,  FALSE,
+    EL_AMOEBA_WET,                     ACTION_OTHER, -1
   },
   {
-    Xfake_door_1,                      TRUE,   FALSE,
-    EL_EM_GATE_1_GRAY,                 -1, -1
+    Xamoeba_7,                         FALSE,  FALSE,
+    EL_AMOEBA_WET,                     ACTION_OTHER, -1
   },
   {
-    Xfake_door_2,                      TRUE,   FALSE,
-    EL_EM_GATE_2_GRAY,                 -1, -1
+    Xamoeba_8,                         FALSE,  FALSE,
+    EL_AMOEBA_WET,                     ACTION_OTHER, -1
   },
   {
-    Xfake_door_3,                      TRUE,   FALSE,
-    EL_EM_GATE_3_GRAY,                 -1, -1
+    Xdoor_1,                           TRUE,   FALSE,
+    EL_EM_GATE_1,                      -1, -1
   },
   {
-    Xfake_door_4,                      TRUE,   FALSE,
-    EL_EM_GATE_4_GRAY,                 -1, -1
+    Xdoor_2,                           TRUE,   FALSE,
+    EL_EM_GATE_2,                      -1, -1
   },
   {
-    Xfake_door_5,                      TRUE,   FALSE,
-    EL_EMC_GATE_5_GRAY,                        -1, -1
+    Xdoor_3,                           TRUE,   FALSE,
+    EL_EM_GATE_3,                      -1, -1
   },
   {
-    Xfake_door_6,                      TRUE,   FALSE,
-    EL_EMC_GATE_6_GRAY,                        -1, -1
+    Xdoor_4,                           TRUE,   FALSE,
+    EL_EM_GATE_4,                      -1, -1
   },
   {
-    Xfake_door_7,                      TRUE,   FALSE,
-    EL_EMC_GATE_7_GRAY,                        -1, -1
+    Xdoor_5,                           TRUE,   FALSE,
+    EL_EMC_GATE_5,                     -1, -1
   },
   {
-    Xfake_door_8,                      TRUE,   FALSE,
-    EL_EMC_GATE_8_GRAY,                        -1, -1
+    Xdoor_6,                           TRUE,   FALSE,
+    EL_EMC_GATE_6,                     -1, -1
   },
   {
-    Xfake_acid_1,                      TRUE,   FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xdoor_7,                           TRUE,   FALSE,
+    EL_EMC_GATE_7,                     -1, -1
   },
   {
-    Xfake_acid_2,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xdoor_8,                           TRUE,   FALSE,
+    EL_EMC_GATE_8,                     -1, -1
   },
   {
-    Xfake_acid_3,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xkey_1,                            TRUE,   FALSE,
+    EL_EM_KEY_1,                       -1, -1
   },
   {
-    Xfake_acid_4,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xkey_2,                            TRUE,   FALSE,
+    EL_EM_KEY_2,                       -1, -1
   },
   {
-    Xfake_acid_5,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xkey_3,                            TRUE,   FALSE,
+    EL_EM_KEY_3,                       -1, -1
   },
   {
-    Xfake_acid_6,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xkey_4,                            TRUE,   FALSE,
+    EL_EM_KEY_4,                       -1, -1
   },
   {
-    Xfake_acid_7,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xkey_5,                            TRUE,   FALSE,
+    EL_EMC_KEY_5,                      -1, -1
   },
   {
-    Xfake_acid_8,                      FALSE,  FALSE,
-    EL_EMC_FAKE_ACID,                  -1, -1
+    Xkey_6,                            TRUE,   FALSE,
+    EL_EMC_KEY_6,                      -1, -1
   },
   {
-    Xsteel_1,                          TRUE,   FALSE,
-    EL_STEELWALL,                      -1, -1
+    Xkey_7,                            TRUE,   FALSE,
+    EL_EMC_KEY_7,                      -1, -1
   },
   {
-    Xsteel_2,                          TRUE,   FALSE,
-    EL_EMC_STEELWALL_2,                        -1, -1
+    Xkey_8,                            TRUE,   FALSE,
+    EL_EMC_KEY_8,                      -1, -1
   },
   {
-    Xsteel_3,                          TRUE,   FALSE,
-    EL_EMC_STEELWALL_3,                        -1, -1
+    Xwind_n,                           TRUE,   FALSE,
+    EL_BALLOON_SWITCH_UP,              -1, -1
   },
   {
-    Xsteel_4,                          TRUE,   FALSE,
-    EL_EMC_STEELWALL_4,                        -1, -1
+    Xwind_e,                           TRUE,   FALSE,
+    EL_BALLOON_SWITCH_RIGHT,           -1, -1
   },
   {
-    Xwall_1,                           TRUE,   FALSE,
-    EL_WALL,                           -1, -1
+    Xwind_s,                           TRUE,   FALSE,
+    EL_BALLOON_SWITCH_DOWN,            -1, -1
   },
   {
-    Xwall_2,                           TRUE,   FALSE,
-    EL_EMC_WALL_14,                    -1, -1
+    Xwind_w,                           TRUE,   FALSE,
+    EL_BALLOON_SWITCH_LEFT,            -1, -1
   },
   {
-    Xwall_3,                           TRUE,   FALSE,
-    EL_EMC_WALL_15,                    -1, -1
+    Xwind_nesw,                                TRUE,   FALSE,
+    EL_BALLOON_SWITCH_ANY,             -1, -1
   },
   {
-    Xwall_4,                           TRUE,   FALSE,
-    EL_EMC_WALL_16,                    -1, -1
+    Xwind_stop,                                TRUE,   FALSE,
+    EL_BALLOON_SWITCH_NONE,            -1, -1
   },
   {
-    Xround_wall_1,                     TRUE,   FALSE,
-    EL_WALL_SLIPPERY,                  -1, -1
+    Xexit,                             TRUE,   FALSE,
+    EL_EM_EXIT_CLOSED,                 -1, -1
   },
   {
-    Xround_wall_2,                     TRUE,   FALSE,
-    EL_EMC_WALL_SLIPPERY_2,            -1, -1
+    Xexit_1,                           TRUE,   FALSE,
+    EL_EM_EXIT_OPEN,                   -1, -1
   },
   {
-    Xround_wall_3,                     TRUE,   FALSE,
-    EL_EMC_WALL_SLIPPERY_3,            -1, -1
+    Xexit_2,                           FALSE,  FALSE,
+    EL_EM_EXIT_OPEN,                   -1, -1
   },
   {
-    Xround_wall_4,                     TRUE,   FALSE,
-    EL_EMC_WALL_SLIPPERY_4,            -1, -1
+    Xexit_3,                           FALSE,  FALSE,
+    EL_EM_EXIT_OPEN,                   -1, -1
   },
   {
-    Xdecor_1,                          TRUE,   FALSE,
-    EL_EMC_WALL_8,                     -1, -1
+    Xdynamite,                         TRUE,   FALSE,
+    EL_EM_DYNAMITE,                    -1, -1
   },
   {
-    Xdecor_2,                          TRUE,   FALSE,
-    EL_EMC_WALL_6,                     -1, -1
+    Ydynamite_eat,                     FALSE,  FALSE,
+    EL_EM_DYNAMITE,                    ACTION_COLLECTING, -1
   },
   {
-    Xdecor_3,                          TRUE,   FALSE,
-    EL_EMC_WALL_4,                     -1, -1
+    Xdynamite_1,                       TRUE,   FALSE,
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
-    Xdecor_4,                          TRUE,   FALSE,
-    EL_EMC_WALL_7,                     -1, -1
+    Xdynamite_2,                       FALSE,  FALSE,
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
-    Xdecor_5,                          TRUE,   FALSE,
-    EL_EMC_WALL_5,                     -1, -1
+    Xdynamite_3,                       FALSE,  FALSE,
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
-    Xdecor_6,                          TRUE,   FALSE,
-    EL_EMC_WALL_9,                     -1, -1
+    Xdynamite_4,                       FALSE,  FALSE,
+    EL_EM_DYNAMITE_ACTIVE,             -1, -1
   },
   {
-    Xdecor_7,                          TRUE,   FALSE,
-    EL_EMC_WALL_10,                    -1, -1
+    Xbumper,                           TRUE,   FALSE,
+    EL_EMC_SPRING_BUMPER,              -1, -1
   },
   {
-    Xdecor_8,                          TRUE,   FALSE,
-    EL_EMC_WALL_1,                     -1, -1
+    XbumperB,                          FALSE,  FALSE,
+    EL_EMC_SPRING_BUMPER,              ACTION_ACTIVE, -1
   },
   {
-    Xdecor_9,                          TRUE,   FALSE,
-    EL_EMC_WALL_2,                     -1, -1
+    Xwheel,                            TRUE,   FALSE,
+    EL_ROBOT_WHEEL,                    -1, -1
   },
   {
-    Xdecor_10,                         TRUE,   FALSE,
-    EL_EMC_WALL_3,                     -1, -1
+    XwheelB,                           FALSE,  FALSE,
+    EL_ROBOT_WHEEL,                    ACTION_ACTIVE, -1
   },
   {
-    Xdecor_11,                         TRUE,   FALSE,
-    EL_EMC_WALL_11,                    -1, -1
+    Xswitch,                           TRUE,   FALSE,
+    EL_EMC_MAGIC_BALL_SWITCH,          -1, -1
   },
   {
-    Xdecor_12,                         TRUE,   FALSE,
-    EL_EMC_WALL_12,                    -1, -1
+    XswitchB,                          FALSE,  FALSE,
+    EL_EMC_MAGIC_BALL_SWITCH,          ACTION_ACTIVE, -1
   },
   {
-    Xalpha_0,                          TRUE,   FALSE,
-    EL_CHAR('0'),                      -1, -1
+    Xsand,                             TRUE,   FALSE,
+    EL_QUICKSAND_EMPTY,                        -1, -1
   },
   {
-    Xalpha_1,                          TRUE,   FALSE,
-    EL_CHAR('1'),                      -1, -1
+    Xsand_stone,                       TRUE,   FALSE,
+    EL_QUICKSAND_FULL,                 -1, -1
   },
   {
-    Xalpha_2,                          TRUE,   FALSE,
-    EL_CHAR('2'),                      -1, -1
+    Xsand_stonein_1,                   FALSE,  TRUE,
+    EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xalpha_3,                          TRUE,   FALSE,
-    EL_CHAR('3'),                      -1, -1
+    Xsand_stonein_2,                   FALSE,  TRUE,
+    EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xalpha_4,                          TRUE,   FALSE,
-    EL_CHAR('4'),                      -1, -1
+    Xsand_stonein_3,                   FALSE,  TRUE,
+    EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xalpha_5,                          TRUE,   FALSE,
-    EL_CHAR('5'),                      -1, -1
+    Xsand_stonein_4,                   FALSE,  TRUE,
+    EL_ROCK,                           ACTION_FILLING, -1
   },
   {
-    Xalpha_6,                          TRUE,   FALSE,
-    EL_CHAR('6'),                      -1, -1
+    Xsand_stonesand_1,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
   },
   {
-    Xalpha_7,                          TRUE,   FALSE,
-    EL_CHAR('7'),                      -1, -1
+    Xsand_stonesand_2,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
   },
   {
-    Xalpha_8,                          TRUE,   FALSE,
-    EL_CHAR('8'),                      -1, -1
+    Xsand_stonesand_3,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
   },
   {
-    Xalpha_9,                          TRUE,   FALSE,
-    EL_CHAR('9'),                      -1, -1
+    Xsand_stonesand_4,                 FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
   },
   {
-    Xalpha_excla,                      TRUE,   FALSE,
-    EL_CHAR('!'),                      -1, -1
+    Xsand_stonesand_quickout_1,                FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
   },
   {
-    Xalpha_quote,                      TRUE,   FALSE,
-    EL_CHAR('"'),                      -1, -1
+    Xsand_stonesand_quickout_2,                FALSE,  FALSE,
+    EL_QUICKSAND_EMPTYING,             -1, -1
   },
   {
-    Xalpha_comma,                      TRUE,   FALSE,
-    EL_CHAR(','),                      -1, -1
+    Xsand_stoneout_1,                  FALSE,  FALSE,
+    EL_ROCK,                           ACTION_EMPTYING, -1
   },
   {
-    Xalpha_minus,                      TRUE,   FALSE,
-    EL_CHAR('-'),                      -1, -1
+    Xsand_stoneout_2,                  FALSE,  FALSE,
+    EL_ROCK,                           ACTION_EMPTYING, -1
   },
   {
-    Xalpha_perio,                      TRUE,   FALSE,
-    EL_CHAR('.'),                      -1, -1
+    Xsand_sandstone_1,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
   },
   {
-    Xalpha_colon,                      TRUE,   FALSE,
-    EL_CHAR(':'),                      -1, -1
+    Xsand_sandstone_2,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
   },
   {
-    Xalpha_quest,                      TRUE,   FALSE,
-    EL_CHAR('?'),                      -1, -1
+    Xsand_sandstone_3,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
   },
   {
-    Xalpha_a,                          TRUE,   FALSE,
-    EL_CHAR('A'),                      -1, -1
+    Xsand_sandstone_4,                 FALSE,  FALSE,
+    EL_QUICKSAND_FILLING,              -1, -1
   },
   {
-    Xalpha_b,                          TRUE,   FALSE,
-    EL_CHAR('B'),                      -1, -1
+    Xplant,                            TRUE,   FALSE,
+    EL_EMC_PLANT,                      -1, -1
   },
   {
-    Xalpha_c,                          TRUE,   FALSE,
-    EL_CHAR('C'),                      -1, -1
+    Yplant,                            FALSE,  FALSE,
+    EL_EMC_PLANT,                      -1, -1
   },
   {
-    Xalpha_d,                          TRUE,   FALSE,
-    EL_CHAR('D'),                      -1, -1
+    Xlenses,                           TRUE,   FALSE,
+    EL_EMC_LENSES,                     -1, -1
   },
   {
-    Xalpha_e,                          TRUE,   FALSE,
-    EL_CHAR('E'),                      -1, -1
+    Xmagnify,                          TRUE,   FALSE,
+    EL_EMC_MAGNIFIER,                  -1, -1
   },
   {
-    Xalpha_f,                          TRUE,   FALSE,
-    EL_CHAR('F'),                      -1, -1
+    Xdripper,                          TRUE,   FALSE,
+    EL_EMC_DRIPPER,                    -1, -1
   },
   {
-    Xalpha_g,                          TRUE,   FALSE,
-    EL_CHAR('G'),                      -1, -1
+    XdripperB,                         FALSE,  FALSE,
+    EL_EMC_DRIPPER,                    ACTION_ACTIVE, -1
   },
   {
-    Xalpha_h,                          TRUE,   FALSE,
-    EL_CHAR('H'),                      -1, -1
+    Xfake_blank,                       TRUE,   FALSE,
+    EL_INVISIBLE_WALL,                 -1, -1
   },
   {
-    Xalpha_i,                          TRUE,   FALSE,
-    EL_CHAR('I'),                      -1, -1
+    Xfake_blankB,                      FALSE,  FALSE,
+    EL_INVISIBLE_WALL,                 ACTION_ACTIVE, -1
   },
   {
-    Xalpha_j,                          TRUE,   FALSE,
-    EL_CHAR('J'),                      -1, -1
+    Xfake_grass,                       TRUE,   FALSE,
+    EL_EMC_FAKE_GRASS,                 -1, -1
   },
   {
-    Xalpha_k,                          TRUE,   FALSE,
-    EL_CHAR('K'),                      -1, -1
+    Xfake_grassB,                      FALSE,  FALSE,
+    EL_EMC_FAKE_GRASS,                 ACTION_ACTIVE, -1
   },
   {
-    Xalpha_l,                          TRUE,   FALSE,
-    EL_CHAR('L'),                      -1, -1
+    Xfake_door_1,                      TRUE,   FALSE,
+    EL_EM_GATE_1_GRAY,                 -1, -1
   },
   {
-    Xalpha_m,                          TRUE,   FALSE,
-    EL_CHAR('M'),                      -1, -1
+    Xfake_door_2,                      TRUE,   FALSE,
+    EL_EM_GATE_2_GRAY,                 -1, -1
   },
   {
-    Xalpha_n,                          TRUE,   FALSE,
-    EL_CHAR('N'),                      -1, -1
+    Xfake_door_3,                      TRUE,   FALSE,
+    EL_EM_GATE_3_GRAY,                 -1, -1
   },
   {
-    Xalpha_o,                          TRUE,   FALSE,
-    EL_CHAR('O'),                      -1, -1
+    Xfake_door_4,                      TRUE,   FALSE,
+    EL_EM_GATE_4_GRAY,                 -1, -1
   },
   {
-    Xalpha_p,                          TRUE,   FALSE,
-    EL_CHAR('P'),                      -1, -1
+    Xfake_door_5,                      TRUE,   FALSE,
+    EL_EMC_GATE_5_GRAY,                        -1, -1
   },
   {
-    Xalpha_q,                          TRUE,   FALSE,
-    EL_CHAR('Q'),                      -1, -1
+    Xfake_door_6,                      TRUE,   FALSE,
+    EL_EMC_GATE_6_GRAY,                        -1, -1
   },
   {
-    Xalpha_r,                          TRUE,   FALSE,
-    EL_CHAR('R'),                      -1, -1
+    Xfake_door_7,                      TRUE,   FALSE,
+    EL_EMC_GATE_7_GRAY,                        -1, -1
   },
   {
-    Xalpha_s,                          TRUE,   FALSE,
-    EL_CHAR('S'),                      -1, -1
+    Xfake_door_8,                      TRUE,   FALSE,
+    EL_EMC_GATE_8_GRAY,                        -1, -1
   },
   {
-    Xalpha_t,                          TRUE,   FALSE,
-    EL_CHAR('T'),                      -1, -1
+    Xfake_acid_1,                      TRUE,   FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_u,                          TRUE,   FALSE,
-    EL_CHAR('U'),                      -1, -1
+    Xfake_acid_2,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_v,                          TRUE,   FALSE,
-    EL_CHAR('V'),                      -1, -1
+    Xfake_acid_3,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_w,                          TRUE,   FALSE,
-    EL_CHAR('W'),                      -1, -1
+    Xfake_acid_4,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_x,                          TRUE,   FALSE,
-    EL_CHAR('X'),                      -1, -1
+    Xfake_acid_5,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_y,                          TRUE,   FALSE,
-    EL_CHAR('Y'),                      -1, -1
+    Xfake_acid_6,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_z,                          TRUE,   FALSE,
-    EL_CHAR('Z'),                      -1, -1
+    Xfake_acid_7,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_arrow_e,                    TRUE,   FALSE,
-    EL_CHAR('>'),                      -1, -1
+    Xfake_acid_8,                      FALSE,  FALSE,
+    EL_EMC_FAKE_ACID,                  -1, -1
   },
   {
-    Xalpha_arrow_w,                    TRUE,   FALSE,
-    EL_CHAR('<'),                      -1, -1
+    Xsteel_1,                          TRUE,   FALSE,
+    EL_STEELWALL,                      -1, -1
   },
   {
-    Xalpha_copyr,                      TRUE,   FALSE,
-    EL_CHAR('©'),                      -1, -1
+    Xsteel_2,                          TRUE,   FALSE,
+    EL_EMC_STEELWALL_2,                        -1, -1
   },
-
   {
-    Xboom_bug,                         FALSE,  FALSE,
-    EL_BUG,                            ACTION_EXPLODING, -1
+    Xsteel_3,                          TRUE,   FALSE,
+    EL_EMC_STEELWALL_3,                        -1, -1
   },
   {
-    Xboom_bomb,                                FALSE,  FALSE,
-    EL_BOMB,                           ACTION_EXPLODING, -1
+    Xsteel_4,                          TRUE,   FALSE,
+    EL_EMC_STEELWALL_4,                        -1, -1
   },
   {
-    Xboom_android,                     FALSE,  FALSE,
-    EL_EMC_ANDROID,                    ACTION_OTHER, -1
+    Xwall_1,                           TRUE,   FALSE,
+    EL_WALL,                           -1, -1
   },
   {
-    Xboom_1,                           FALSE,  FALSE,
-    EL_DEFAULT,                                ACTION_EXPLODING, -1
+    Xwall_2,                           TRUE,   FALSE,
+    EL_EMC_WALL_14,                    -1, -1
   },
   {
-    Xboom_2,                           FALSE,  FALSE,
-    EL_DEFAULT,                                ACTION_EXPLODING, -1
+    Xwall_3,                           TRUE,   FALSE,
+    EL_EMC_WALL_15,                    -1, -1
   },
   {
-    Znormal,                           FALSE,  FALSE,
-    EL_EMPTY,                          -1, -1
+    Xwall_4,                           TRUE,   FALSE,
+    EL_EMC_WALL_16,                    -1, -1
   },
   {
-    Zdynamite,                         FALSE,  FALSE,
-    EL_EMPTY,                          -1, -1
+    Xround_wall_1,                     TRUE,   FALSE,
+    EL_WALL_SLIPPERY,                  -1, -1
   },
   {
-    Zplayer,                           FALSE,  FALSE,
-    EL_EMPTY,                          -1, -1
+    Xround_wall_2,                     TRUE,   FALSE,
+    EL_EMC_WALL_SLIPPERY_2,            -1, -1
   },
   {
-    ZBORDER,                           FALSE,  FALSE,
-    EL_EMPTY,                          -1, -1
+    Xround_wall_3,                     TRUE,   FALSE,
+    EL_EMC_WALL_SLIPPERY_3,            -1, -1
   },
-
   {
-    -1,                                        FALSE,  FALSE,
-    -1,                                        -1, -1
-  }
-};
-
-static struct Mapping_EM_to_RND_player
-{
-  int action_em;
-  int player_nr;
-
-  int element_rnd;
-  int action;
-  int direction;
-}
-em_player_mapping_list[] =
-{
+    Xround_wall_4,                     TRUE,   FALSE,
+    EL_EMC_WALL_SLIPPERY_4,            -1, -1
+  },
   {
-    SPR_walk + 0,                      0,
-    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_UP,
+    Xdecor_1,                          TRUE,   FALSE,
+    EL_EMC_WALL_8,                     -1, -1
   },
   {
-    SPR_walk + 1,                      0,
-    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_RIGHT,
+    Xdecor_2,                          TRUE,   FALSE,
+    EL_EMC_WALL_6,                     -1, -1
   },
   {
-    SPR_walk + 2,                      0,
-    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_DOWN,
+    Xdecor_3,                          TRUE,   FALSE,
+    EL_EMC_WALL_4,                     -1, -1
   },
   {
-    SPR_walk + 3,                      0,
-    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_LEFT,
+    Xdecor_4,                          TRUE,   FALSE,
+    EL_EMC_WALL_7,                     -1, -1
   },
   {
-    SPR_push + 0,                      0,
-    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_UP,
+    Xdecor_5,                          TRUE,   FALSE,
+    EL_EMC_WALL_5,                     -1, -1
   },
   {
-    SPR_push + 1,                      0,
-    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_RIGHT,
+    Xdecor_6,                          TRUE,   FALSE,
+    EL_EMC_WALL_9,                     -1, -1
   },
   {
-    SPR_push + 2,                      0,
-    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_DOWN,
+    Xdecor_7,                          TRUE,   FALSE,
+    EL_EMC_WALL_10,                    -1, -1
   },
   {
-    SPR_push + 3,                      0,
-    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_LEFT,
+    Xdecor_8,                          TRUE,   FALSE,
+    EL_EMC_WALL_1,                     -1, -1
   },
   {
-    SPR_spray + 0,                     0,
-    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_UP,
+    Xdecor_9,                          TRUE,   FALSE,
+    EL_EMC_WALL_2,                     -1, -1
   },
   {
-    SPR_spray + 1,                     0,
-    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+    Xdecor_10,                         TRUE,   FALSE,
+    EL_EMC_WALL_3,                     -1, -1
   },
   {
-    SPR_spray + 2,                     0,
-    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_DOWN,
+    Xdecor_11,                         TRUE,   FALSE,
+    EL_EMC_WALL_11,                    -1, -1
   },
   {
-    SPR_spray + 3,                     0,
-    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_LEFT,
+    Xdecor_12,                         TRUE,   FALSE,
+    EL_EMC_WALL_12,                    -1, -1
   },
   {
-    SPR_walk + 0,                      1,
-    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_UP,
+    Xalpha_0,                          TRUE,   FALSE,
+    EL_CHAR('0'),                      -1, -1
   },
   {
-    SPR_walk + 1,                      1,
-    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_RIGHT,
+    Xalpha_1,                          TRUE,   FALSE,
+    EL_CHAR('1'),                      -1, -1
   },
   {
-    SPR_walk + 2,                      1,
-    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_DOWN,
+    Xalpha_2,                          TRUE,   FALSE,
+    EL_CHAR('2'),                      -1, -1
   },
   {
-    SPR_walk + 3,                      1,
-    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_LEFT,
+    Xalpha_3,                          TRUE,   FALSE,
+    EL_CHAR('3'),                      -1, -1
   },
   {
-    SPR_push + 0,                      1,
-    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_UP,
+    Xalpha_4,                          TRUE,   FALSE,
+    EL_CHAR('4'),                      -1, -1
   },
   {
-    SPR_push + 1,                      1,
-    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_RIGHT,
+    Xalpha_5,                          TRUE,   FALSE,
+    EL_CHAR('5'),                      -1, -1
   },
   {
-    SPR_push + 2,                      1,
-    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_DOWN,
+    Xalpha_6,                          TRUE,   FALSE,
+    EL_CHAR('6'),                      -1, -1
   },
   {
-    SPR_push + 3,                      1,
-    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_LEFT,
+    Xalpha_7,                          TRUE,   FALSE,
+    EL_CHAR('7'),                      -1, -1
   },
   {
-    SPR_spray + 0,                     1,
-    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_UP,
+    Xalpha_8,                          TRUE,   FALSE,
+    EL_CHAR('8'),                      -1, -1
   },
   {
-    SPR_spray + 1,                     1,
-    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+    Xalpha_9,                          TRUE,   FALSE,
+    EL_CHAR('9'),                      -1, -1
   },
   {
-    SPR_spray + 2,                     1,
-    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_DOWN,
+    Xalpha_excla,                      TRUE,   FALSE,
+    EL_CHAR('!'),                      -1, -1
   },
   {
-    SPR_spray + 3,                     1,
-    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_LEFT,
+    Xalpha_quote,                      TRUE,   FALSE,
+    EL_CHAR('"'),                      -1, -1
   },
   {
-    SPR_still,                         0,
-    EL_PLAYER_1,                       ACTION_DEFAULT, -1,
+    Xalpha_comma,                      TRUE,   FALSE,
+    EL_CHAR(','),                      -1, -1
   },
   {
-    SPR_still,                         1,
-    EL_PLAYER_2,                       ACTION_DEFAULT, -1,
+    Xalpha_minus,                      TRUE,   FALSE,
+    EL_CHAR('-'),                      -1, -1
   },
   {
-    SPR_walk + 0,                      2,
-    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_UP,
+    Xalpha_perio,                      TRUE,   FALSE,
+    EL_CHAR('.'),                      -1, -1
   },
   {
-    SPR_walk + 1,                      2,
-    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_RIGHT,
+    Xalpha_colon,                      TRUE,   FALSE,
+    EL_CHAR(':'),                      -1, -1
   },
   {
-    SPR_walk + 2,                      2,
-    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_DOWN,
+    Xalpha_quest,                      TRUE,   FALSE,
+    EL_CHAR('?'),                      -1, -1
   },
   {
-    SPR_walk + 3,                      2,
-    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_LEFT,
+    Xalpha_a,                          TRUE,   FALSE,
+    EL_CHAR('A'),                      -1, -1
   },
   {
-    SPR_push + 0,                      2,
-    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_UP,
+    Xalpha_b,                          TRUE,   FALSE,
+    EL_CHAR('B'),                      -1, -1
   },
   {
-    SPR_push + 1,                      2,
-    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_RIGHT,
+    Xalpha_c,                          TRUE,   FALSE,
+    EL_CHAR('C'),                      -1, -1
   },
   {
-    SPR_push + 2,                      2,
-    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_DOWN,
+    Xalpha_d,                          TRUE,   FALSE,
+    EL_CHAR('D'),                      -1, -1
   },
   {
-    SPR_push + 3,                      2,
-    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_LEFT,
+    Xalpha_e,                          TRUE,   FALSE,
+    EL_CHAR('E'),                      -1, -1
   },
   {
-    SPR_spray + 0,                     2,
-    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_UP,
+    Xalpha_f,                          TRUE,   FALSE,
+    EL_CHAR('F'),                      -1, -1
   },
   {
-    SPR_spray + 1,                     2,
-    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+    Xalpha_g,                          TRUE,   FALSE,
+    EL_CHAR('G'),                      -1, -1
   },
   {
-    SPR_spray + 2,                     2,
-    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_DOWN,
+    Xalpha_h,                          TRUE,   FALSE,
+    EL_CHAR('H'),                      -1, -1
   },
   {
-    SPR_spray + 3,                     2,
-    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_LEFT,
+    Xalpha_i,                          TRUE,   FALSE,
+    EL_CHAR('I'),                      -1, -1
   },
   {
-    SPR_walk + 0,                      3,
-    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_UP,
+    Xalpha_j,                          TRUE,   FALSE,
+    EL_CHAR('J'),                      -1, -1
   },
   {
-    SPR_walk + 1,                      3,
-    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_RIGHT,
+    Xalpha_k,                          TRUE,   FALSE,
+    EL_CHAR('K'),                      -1, -1
   },
   {
-    SPR_walk + 2,                      3,
-    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_DOWN,
+    Xalpha_l,                          TRUE,   FALSE,
+    EL_CHAR('L'),                      -1, -1
   },
   {
-    SPR_walk + 3,                      3,
-    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_LEFT,
+    Xalpha_m,                          TRUE,   FALSE,
+    EL_CHAR('M'),                      -1, -1
   },
   {
-    SPR_push + 0,                      3,
-    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_UP,
+    Xalpha_n,                          TRUE,   FALSE,
+    EL_CHAR('N'),                      -1, -1
   },
   {
-    SPR_push + 1,                      3,
-    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_RIGHT,
+    Xalpha_o,                          TRUE,   FALSE,
+    EL_CHAR('O'),                      -1, -1
   },
   {
-    SPR_push + 2,                      3,
-    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_DOWN,
+    Xalpha_p,                          TRUE,   FALSE,
+    EL_CHAR('P'),                      -1, -1
   },
   {
-    SPR_push + 3,                      3,
-    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_LEFT,
+    Xalpha_q,                          TRUE,   FALSE,
+    EL_CHAR('Q'),                      -1, -1
   },
   {
-    SPR_spray + 0,                     3,
-    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_UP,
+    Xalpha_r,                          TRUE,   FALSE,
+    EL_CHAR('R'),                      -1, -1
   },
   {
-    SPR_spray + 1,                     3,
-    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+    Xalpha_s,                          TRUE,   FALSE,
+    EL_CHAR('S'),                      -1, -1
   },
   {
-    SPR_spray + 2,                     3,
-    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_DOWN,
+    Xalpha_t,                          TRUE,   FALSE,
+    EL_CHAR('T'),                      -1, -1
   },
   {
-    SPR_spray + 3,                     3,
-    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_LEFT,
+    Xalpha_u,                          TRUE,   FALSE,
+    EL_CHAR('U'),                      -1, -1
   },
   {
-    SPR_still,                         2,
-    EL_PLAYER_3,                       ACTION_DEFAULT, -1,
+    Xalpha_v,                          TRUE,   FALSE,
+    EL_CHAR('V'),                      -1, -1
   },
   {
-    SPR_still,                         3,
-    EL_PLAYER_4,                       ACTION_DEFAULT, -1,
+    Xalpha_w,                          TRUE,   FALSE,
+    EL_CHAR('W'),                      -1, -1
   },
-
   {
-    -1,                                        -1,
-    -1,                                        -1, -1
-  }
-};
-
-int map_element_RND_to_EM(int element_rnd)
-{
-  static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS];
-  static boolean mapping_initialized = FALSE;
-
-  if (!mapping_initialized)
+    Xalpha_x,                          TRUE,   FALSE,
+    EL_CHAR('X'),                      -1, -1
+  },
   {
-    int i;
-
-    /* return "Xalpha_quest" for all undefined elements in mapping array */
-    for (i = 0; i < NUM_FILE_ELEMENTS; i++)
-      mapping_RND_to_EM[i] = Xalpha_quest;
-
-    for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
-      if (em_object_mapping_list[i].is_rnd_to_em_mapping)
-       mapping_RND_to_EM[em_object_mapping_list[i].element_rnd] =
-         em_object_mapping_list[i].element_em;
-
-    mapping_initialized = TRUE;
-  }
-
-  if (element_rnd >= 0 && element_rnd < NUM_FILE_ELEMENTS)
-    return mapping_RND_to_EM[element_rnd];
-
-  Error(ERR_WARN, "invalid RND level element %d", element_rnd);
-
-  return EL_UNKNOWN;
-}
-
-int map_element_EM_to_RND(int element_em)
-{
-  static unsigned short mapping_EM_to_RND[TILE_MAX];
-  static boolean mapping_initialized = FALSE;
-
-  if (!mapping_initialized)
+    Xalpha_y,                          TRUE,   FALSE,
+    EL_CHAR('Y'),                      -1, -1
+  },
   {
-    int i;
-
-    /* return "EL_UNKNOWN" for all undefined elements in mapping array */
-    for (i = 0; i < TILE_MAX; i++)
-      mapping_EM_to_RND[i] = EL_UNKNOWN;
-
-    for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
-      mapping_EM_to_RND[em_object_mapping_list[i].element_em] =
-       em_object_mapping_list[i].element_rnd;
-
-    mapping_initialized = TRUE;
-  }
-
-  if (element_em >= 0 && element_em < TILE_MAX)
-    return mapping_EM_to_RND[element_em];
-
-  Error(ERR_WARN, "invalid EM level element %d", element_em);
-
-  return EL_UNKNOWN;
-}
-
-void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
-{
-  struct LevelInfo_EM *level_em = level->native_em_level;
-  struct LEVEL *lev = level_em->lev;
-  int i, j;
-
-  for (i = 0; i < TILE_MAX; i++)
-    lev->android_array[i] = Xblank;
-
-  for (i = 0; i < level->num_android_clone_elements; i++)
+    Xalpha_z,                          TRUE,   FALSE,
+    EL_CHAR('Z'),                      -1, -1
+  },
   {
-    int element_rnd = level->android_clone_element[i];
-    int element_em = map_element_RND_to_EM(element_rnd);
-
-    for (j = 0; em_object_mapping_list[j].element_em != -1; j++)
-      if (em_object_mapping_list[j].element_rnd == element_rnd)
-       lev->android_array[em_object_mapping_list[j].element_em] = element_em;
-  }
-}
-
-void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
-{
-  struct LevelInfo_EM *level_em = level->native_em_level;
-  struct LEVEL *lev = level_em->lev;
-  int i, j;
-
-  level->num_android_clone_elements = 0;
-
-  for (i = 0; i < TILE_MAX; i++)
+    Xalpha_arrow_e,                    TRUE,   FALSE,
+    EL_CHAR('>'),                      -1, -1
+  },
   {
-    int element_em = lev->android_array[i];
-    int element_rnd;
-    boolean element_found = FALSE;
-
-    if (element_em == Xblank)
-      continue;
-
-    element_rnd = map_element_EM_to_RND(element_em);
-
-    for (j = 0; j < level->num_android_clone_elements; j++)
-      if (level->android_clone_element[j] == element_rnd)
-       element_found = TRUE;
-
-    if (!element_found)
-    {
-      level->android_clone_element[level->num_android_clone_elements++] =
-       element_rnd;
-
-      if (level->num_android_clone_elements == MAX_ANDROID_ELEMENTS)
-       break;
-    }
-  }
-
-  if (level->num_android_clone_elements == 0)
+    Xalpha_arrow_w,                    TRUE,   FALSE,
+    EL_CHAR('<'),                      -1, -1
+  },
   {
-    level->num_android_clone_elements = 1;
-    level->android_clone_element[0] = EL_EMPTY;
-  }
-}
-
-int map_direction_RND_to_EM(int direction)
-{
-  return (direction == MV_UP    ? 0 :
-         direction == MV_RIGHT ? 1 :
-         direction == MV_DOWN  ? 2 :
-         direction == MV_LEFT  ? 3 :
-         -1);
-}
-
-int map_direction_EM_to_RND(int direction)
-{
-  return (direction == 0 ? MV_UP    :
-         direction == 1 ? MV_RIGHT :
-         direction == 2 ? MV_DOWN  :
-         direction == 3 ? MV_LEFT  :
-         MV_NONE);
-}
-
-int map_element_RND_to_SP(int element_rnd)
-{
-  int element_sp = 0x20;       /* map unknown elements to yellow "hardware" */
-
-  if (element_rnd >= EL_SP_START &&
-      element_rnd <= EL_SP_END)
-    element_sp = element_rnd - EL_SP_START;
-  else if (element_rnd == EL_EMPTY_SPACE)
-    element_sp = 0x00;
-  else if (element_rnd == EL_INVISIBLE_WALL)
-    element_sp = 0x28;
-
-  return element_sp;
-}
-
-int map_element_SP_to_RND(int element_sp)
-{
-  int element_rnd = EL_UNKNOWN;
-
-  if (element_sp >= 0x00 &&
-      element_sp <= 0x27)
-    element_rnd = EL_SP_START + element_sp;
-  else if (element_sp == 0x28)
-    element_rnd = EL_INVISIBLE_WALL;
-
-  return element_rnd;
-}
+    Xalpha_copyr,                      TRUE,   FALSE,
+    EL_CHAR(CHAR_BYTE_COPYRIGHT),      -1, -1
+  },
 
-int map_action_SP_to_RND(int action_sp)
-{
-  switch (action_sp)
   {
-    case actActive:            return ACTION_ACTIVE;
-    case actImpact:            return ACTION_IMPACT;
-    case actExploding:         return ACTION_EXPLODING;
-    case actDigging:           return ACTION_DIGGING;
-    case actSnapping:          return ACTION_SNAPPING;
-    case actCollecting:                return ACTION_COLLECTING;
-    case actPassing:           return ACTION_PASSING;
-    case actPushing:           return ACTION_PUSHING;
-    case actDropping:          return ACTION_DROPPING;
-
-    default:                   return ACTION_DEFAULT;
-  }
-}
-
-int get_next_element(int element)
-{
-  switch (element)
+    Xboom_bug,                         FALSE,  FALSE,
+    EL_BUG,                            ACTION_EXPLODING, -1
+  },
   {
-    case EL_QUICKSAND_FILLING:         return EL_QUICKSAND_FULL;
-    case EL_QUICKSAND_EMPTYING:                return EL_QUICKSAND_EMPTY;
-    case EL_QUICKSAND_FAST_FILLING:    return EL_QUICKSAND_FAST_FULL;
-    case EL_QUICKSAND_FAST_EMPTYING:   return EL_QUICKSAND_FAST_EMPTY;
-    case EL_MAGIC_WALL_FILLING:                return EL_MAGIC_WALL_FULL;
-    case EL_MAGIC_WALL_EMPTYING:       return EL_MAGIC_WALL_ACTIVE;
-    case EL_BD_MAGIC_WALL_FILLING:     return EL_BD_MAGIC_WALL_FULL;
-    case EL_BD_MAGIC_WALL_EMPTYING:    return EL_BD_MAGIC_WALL_ACTIVE;
-    case EL_DC_MAGIC_WALL_FILLING:     return EL_DC_MAGIC_WALL_FULL;
-    case EL_DC_MAGIC_WALL_EMPTYING:    return EL_DC_MAGIC_WALL_ACTIVE;
-    case EL_AMOEBA_DROPPING:           return EL_AMOEBA_WET;
-
-    default:                           return element;
-  }
-}
-
-#if 0
-int el_act_dir2img(int element, int action, int direction)
-{
-  element = GFX_ELEMENT(element);
-
-  if (direction == MV_NONE)
-    return element_info[element].graphic[action];
-
-  direction = MV_DIR_TO_BIT(direction);
-
-  return element_info[element].direction_graphic[action][direction];
-}
-#else
-int el_act_dir2img(int element, int action, int direction)
-{
-  element = GFX_ELEMENT(element);
-  direction = MV_DIR_TO_BIT(direction);        /* default: MV_NONE => MV_DOWN */
-
-  /* direction_graphic[][] == graphic[] for undefined direction graphics */
-  return element_info[element].direction_graphic[action][direction];
-}
-#endif
-
-#if 0
-static int el_act_dir2crm(int element, int action, int direction)
-{
-  element = GFX_ELEMENT(element);
-
-  if (direction == MV_NONE)
-    return element_info[element].crumbled[action];
-
-  direction = MV_DIR_TO_BIT(direction);
-
-  return element_info[element].direction_crumbled[action][direction];
-}
-#else
-static int el_act_dir2crm(int element, int action, int direction)
-{
-  element = GFX_ELEMENT(element);
-  direction = MV_DIR_TO_BIT(direction);        /* default: MV_NONE => MV_DOWN */
-
-  /* direction_graphic[][] == graphic[] for undefined direction graphics */
-  return element_info[element].direction_crumbled[action][direction];
-}
-#endif
-
-int el_act2img(int element, int action)
-{
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].graphic[action];
-}
-
-int el_act2crm(int element, int action)
-{
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].crumbled[action];
-}
-
-int el_dir2img(int element, int direction)
-{
-  element = GFX_ELEMENT(element);
-
-  return el_act_dir2img(element, ACTION_DEFAULT, direction);
-}
-
-int el2baseimg(int element)
-{
-  return element_info[element].graphic[ACTION_DEFAULT];
-}
-
-int el2img(int element)
-{
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].graphic[ACTION_DEFAULT];
-}
-
-int el2edimg(int element)
-{
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
-}
-
-int el2preimg(int element)
-{
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
-}
-
-int el2panelimg(int element)
-{
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PANEL];
-}
-
-int font2baseimg(int font_nr)
-{
-  return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
-}
+    Xboom_bomb,                                FALSE,  FALSE,
+    EL_BOMB,                           ACTION_EXPLODING, -1
+  },
+  {
+    Xboom_android,                     FALSE,  FALSE,
+    EL_EMC_ANDROID,                    ACTION_OTHER, -1
+  },
+  {
+    Xboom_1,                           FALSE,  FALSE,
+    EL_DEFAULT,                                ACTION_EXPLODING, -1
+  },
+  {
+    Xboom_2,                           FALSE,  FALSE,
+    EL_DEFAULT,                                ACTION_EXPLODING, -1
+  },
+  {
+    Znormal,                           FALSE,  FALSE,
+    EL_EMPTY,                          -1, -1
+  },
+  {
+    Zdynamite,                         FALSE,  FALSE,
+    EL_EMPTY,                          -1, -1
+  },
+  {
+    Zplayer,                           FALSE,  FALSE,
+    EL_EMPTY,                          -1, -1
+  },
+  {
+    ZBORDER,                           FALSE,  FALSE,
+    EL_EMPTY,                          -1, -1
+  },
 
-int getBeltNrFromBeltElement(int element)
-{
-  return (element < EL_CONVEYOR_BELT_2_LEFT ? 0 :
-         element < EL_CONVEYOR_BELT_3_LEFT ? 1 :
-         element < EL_CONVEYOR_BELT_4_LEFT ? 2 : 3);
-}
+  {
+    -1,                                        FALSE,  FALSE,
+    -1,                                        -1, -1
+  }
+};
 
-int getBeltNrFromBeltActiveElement(int element)
+static struct Mapping_EM_to_RND_player
 {
-  return (element < EL_CONVEYOR_BELT_2_LEFT_ACTIVE ? 0 :
-         element < EL_CONVEYOR_BELT_3_LEFT_ACTIVE ? 1 :
-         element < EL_CONVEYOR_BELT_4_LEFT_ACTIVE ? 2 : 3);
-}
+  int action_em;
+  int player_nr;
 
-int getBeltNrFromBeltSwitchElement(int element)
-{
-  return (element < EL_CONVEYOR_BELT_2_SWITCH_LEFT ? 0 :
-         element < EL_CONVEYOR_BELT_3_SWITCH_LEFT ? 1 :
-         element < EL_CONVEYOR_BELT_4_SWITCH_LEFT ? 2 : 3);
+  int element_rnd;
+  int action;
+  int direction;
 }
-
-int getBeltDirNrFromBeltElement(int element)
+em_player_mapping_list[] =
 {
-  static int belt_base_element[4] =
   {
-    EL_CONVEYOR_BELT_1_LEFT,
-    EL_CONVEYOR_BELT_2_LEFT,
-    EL_CONVEYOR_BELT_3_LEFT,
-    EL_CONVEYOR_BELT_4_LEFT
-  };
-
-  int belt_nr = getBeltNrFromBeltElement(element);
-  int belt_dir_nr = element - belt_base_element[belt_nr];
+    SPR_walk + 0,                      0,
+    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_UP,
+  },
+  {
+    SPR_walk + 1,                      0,
+    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_walk + 2,                      0,
+    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_DOWN,
+  },
+  {
+    SPR_walk + 3,                      0,
+    EL_PLAYER_1,                       ACTION_MOVING, MV_BIT_LEFT,
+  },
+  {
+    SPR_push + 0,                      0,
+    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_UP,
+  },
+  {
+    SPR_push + 1,                      0,
+    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_push + 2,                      0,
+    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_DOWN,
+  },
+  {
+    SPR_push + 3,                      0,
+    EL_PLAYER_1,                       ACTION_PUSHING, MV_BIT_LEFT,
+  },
+  {
+    SPR_spray + 0,                     0,
+    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_UP,
+  },
+  {
+    SPR_spray + 1,                     0,
+    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_spray + 2,                     0,
+    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_DOWN,
+  },
+  {
+    SPR_spray + 3,                     0,
+    EL_PLAYER_1,                       ACTION_SNAPPING, MV_BIT_LEFT,
+  },
+  {
+    SPR_walk + 0,                      1,
+    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_UP,
+  },
+  {
+    SPR_walk + 1,                      1,
+    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_walk + 2,                      1,
+    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_DOWN,
+  },
+  {
+    SPR_walk + 3,                      1,
+    EL_PLAYER_2,                       ACTION_MOVING, MV_BIT_LEFT,
+  },
+  {
+    SPR_push + 0,                      1,
+    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_UP,
+  },
+  {
+    SPR_push + 1,                      1,
+    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_push + 2,                      1,
+    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_DOWN,
+  },
+  {
+    SPR_push + 3,                      1,
+    EL_PLAYER_2,                       ACTION_PUSHING, MV_BIT_LEFT,
+  },
+  {
+    SPR_spray + 0,                     1,
+    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_UP,
+  },
+  {
+    SPR_spray + 1,                     1,
+    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_spray + 2,                     1,
+    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_DOWN,
+  },
+  {
+    SPR_spray + 3,                     1,
+    EL_PLAYER_2,                       ACTION_SNAPPING, MV_BIT_LEFT,
+  },
+  {
+    SPR_still,                         0,
+    EL_PLAYER_1,                       ACTION_DEFAULT, -1,
+  },
+  {
+    SPR_still,                         1,
+    EL_PLAYER_2,                       ACTION_DEFAULT, -1,
+  },
+  {
+    SPR_walk + 0,                      2,
+    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_UP,
+  },
+  {
+    SPR_walk + 1,                      2,
+    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_walk + 2,                      2,
+    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_DOWN,
+  },
+  {
+    SPR_walk + 3,                      2,
+    EL_PLAYER_3,                       ACTION_MOVING, MV_BIT_LEFT,
+  },
+  {
+    SPR_push + 0,                      2,
+    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_UP,
+  },
+  {
+    SPR_push + 1,                      2,
+    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_push + 2,                      2,
+    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_DOWN,
+  },
+  {
+    SPR_push + 3,                      2,
+    EL_PLAYER_3,                       ACTION_PUSHING, MV_BIT_LEFT,
+  },
+  {
+    SPR_spray + 0,                     2,
+    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_UP,
+  },
+  {
+    SPR_spray + 1,                     2,
+    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_spray + 2,                     2,
+    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_DOWN,
+  },
+  {
+    SPR_spray + 3,                     2,
+    EL_PLAYER_3,                       ACTION_SNAPPING, MV_BIT_LEFT,
+  },
+  {
+    SPR_walk + 0,                      3,
+    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_UP,
+  },
+  {
+    SPR_walk + 1,                      3,
+    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_walk + 2,                      3,
+    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_DOWN,
+  },
+  {
+    SPR_walk + 3,                      3,
+    EL_PLAYER_4,                       ACTION_MOVING, MV_BIT_LEFT,
+  },
+  {
+    SPR_push + 0,                      3,
+    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_UP,
+  },
+  {
+    SPR_push + 1,                      3,
+    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_push + 2,                      3,
+    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_DOWN,
+  },
+  {
+    SPR_push + 3,                      3,
+    EL_PLAYER_4,                       ACTION_PUSHING, MV_BIT_LEFT,
+  },
+  {
+    SPR_spray + 0,                     3,
+    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_UP,
+  },
+  {
+    SPR_spray + 1,                     3,
+    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_RIGHT,
+  },
+  {
+    SPR_spray + 2,                     3,
+    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_DOWN,
+  },
+  {
+    SPR_spray + 3,                     3,
+    EL_PLAYER_4,                       ACTION_SNAPPING, MV_BIT_LEFT,
+  },
+  {
+    SPR_still,                         2,
+    EL_PLAYER_3,                       ACTION_DEFAULT, -1,
+  },
+  {
+    SPR_still,                         3,
+    EL_PLAYER_4,                       ACTION_DEFAULT, -1,
+  },
 
-  return (belt_dir_nr % 3);
-}
+  {
+    -1,                                        -1,
+    -1,                                        -1, -1
+  }
+};
 
-int getBeltDirNrFromBeltSwitchElement(int element)
+int map_element_RND_to_EM(int element_rnd)
 {
-  static int belt_base_element[4] =
+  static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS];
+  static boolean mapping_initialized = FALSE;
+
+  if (!mapping_initialized)
   {
-    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
-    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
-    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
-    EL_CONVEYOR_BELT_4_SWITCH_LEFT
-  };
+    int i;
 
-  int belt_nr = getBeltNrFromBeltSwitchElement(element);
-  int belt_dir_nr = element - belt_base_element[belt_nr];
+    /* return "Xalpha_quest" for all undefined elements in mapping array */
+    for (i = 0; i < NUM_FILE_ELEMENTS; i++)
+      mapping_RND_to_EM[i] = Xalpha_quest;
 
-  return (belt_dir_nr % 3);
-}
+    for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
+      if (em_object_mapping_list[i].is_rnd_to_em_mapping)
+       mapping_RND_to_EM[em_object_mapping_list[i].element_rnd] =
+         em_object_mapping_list[i].element_em;
 
-int getBeltDirFromBeltElement(int element)
-{
-  static int belt_move_dir[3] =
-  {
-    MV_LEFT,
-    MV_NONE,
-    MV_RIGHT
-  };
+    mapping_initialized = TRUE;
+  }
 
-  int belt_dir_nr = getBeltDirNrFromBeltElement(element);
+  if (element_rnd >= 0 && element_rnd < NUM_FILE_ELEMENTS)
+    return mapping_RND_to_EM[element_rnd];
 
-  return belt_move_dir[belt_dir_nr];
+  Error(ERR_WARN, "invalid RND level element %d", element_rnd);
+
+  return EL_UNKNOWN;
 }
 
-int getBeltDirFromBeltSwitchElement(int element)
+int map_element_EM_to_RND(int element_em)
 {
-  static int belt_move_dir[3] =
+  static unsigned short mapping_EM_to_RND[TILE_MAX];
+  static boolean mapping_initialized = FALSE;
+
+  if (!mapping_initialized)
   {
-    MV_LEFT,
-    MV_NONE,
-    MV_RIGHT
-  };
+    int i;
 
-  int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(element);
+    /* return "EL_UNKNOWN" for all undefined elements in mapping array */
+    for (i = 0; i < TILE_MAX; i++)
+      mapping_EM_to_RND[i] = EL_UNKNOWN;
 
-  return belt_move_dir[belt_dir_nr];
-}
+    for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
+      mapping_EM_to_RND[em_object_mapping_list[i].element_em] =
+       em_object_mapping_list[i].element_rnd;
 
-int getBeltElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr)
-{
-  static int belt_base_element[4] =
-  {
-    EL_CONVEYOR_BELT_1_LEFT,
-    EL_CONVEYOR_BELT_2_LEFT,
-    EL_CONVEYOR_BELT_3_LEFT,
-    EL_CONVEYOR_BELT_4_LEFT
-  };
+    mapping_initialized = TRUE;
+  }
 
-  return belt_base_element[belt_nr] + belt_dir_nr;
-}
+  if (element_em >= 0 && element_em < TILE_MAX)
+    return mapping_EM_to_RND[element_em];
 
-int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
-{
-  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
+  Error(ERR_WARN, "invalid EM level element %d", element_em);
 
-  return getBeltElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
+  return EL_UNKNOWN;
 }
 
-int getBeltSwitchElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr)
+void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
 {
-  static int belt_base_element[4] =
-  {
-    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
-    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
-    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
-    EL_CONVEYOR_BELT_4_SWITCH_LEFT
-  };
+  struct LevelInfo_EM *level_em = level->native_em_level;
+  struct LEVEL *lev = level_em->lev;
+  int i, j;
 
-  return belt_base_element[belt_nr] + belt_dir_nr;
-}
+  for (i = 0; i < TILE_MAX; i++)
+    lev->android_array[i] = Xblank;
 
-int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
-{
-  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
+  for (i = 0; i < level->num_android_clone_elements; i++)
+  {
+    int element_rnd = level->android_clone_element[i];
+    int element_em = map_element_RND_to_EM(element_rnd);
 
-  return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
+    for (j = 0; em_object_mapping_list[j].element_em != -1; j++)
+      if (em_object_mapping_list[j].element_rnd == element_rnd)
+       lev->android_array[em_object_mapping_list[j].element_em] = element_em;
+  }
 }
 
-#if 1
-boolean getTeamMode_EM()
-{
-  return game.team_mode;
-}
-#else
-int getNumActivePlayers_EM()
+void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
 {
-#if 1
-  int num_players = 0;
-  int i;
+  struct LevelInfo_EM *level_em = level->native_em_level;
+  struct LEVEL *lev = level_em->lev;
+  int i, j;
 
-  if (!tape.playing)
-    return (setup.team_mode ? MAX_PLAYERS : 1);
+  level->num_android_clone_elements = 0;
 
-  for (i = 0; i < MAX_PLAYERS; i++)
-    if (tape.player_participates[i])
-      num_players++;
+  for (i = 0; i < TILE_MAX; i++)
+  {
+    int element_em = lev->android_array[i];
+    int element_rnd;
+    boolean element_found = FALSE;
 
-  return (num_players > 1 ? MAX_PLAYERS : 1);
+    if (element_em == Xblank)
+      continue;
 
-#else
+    element_rnd = map_element_EM_to_RND(element_em);
 
-  int num_players = 0;
-  int i;
+    for (j = 0; j < level->num_android_clone_elements; j++)
+      if (level->android_clone_element[j] == element_rnd)
+       element_found = TRUE;
 
-  /* when recording game, activate all connected players */
-  if (!tape.playing)
-    return -1;
+    if (!element_found)
+    {
+      level->android_clone_element[level->num_android_clone_elements++] =
+       element_rnd;
 
-  for (i = 0; i < MAX_PLAYERS; i++)
-    if (tape.player_participates[i])
-      num_players++;
+      if (level->num_android_clone_elements == MAX_ANDROID_ELEMENTS)
+       break;
+    }
+  }
 
-  return num_players;
-#endif
+  if (level->num_android_clone_elements == 0)
+  {
+    level->num_android_clone_elements = 1;
+    level->android_clone_element[0] = EL_EMPTY;
+  }
 }
-#endif
 
-int getGameFrameDelay_EM(int native_em_game_frame_delay)
+int map_direction_RND_to_EM(int direction)
 {
-  int game_frame_delay_value;
+  return (direction == MV_UP    ? 0 :
+         direction == MV_RIGHT ? 1 :
+         direction == MV_DOWN  ? 2 :
+         direction == MV_LEFT  ? 3 :
+         -1);
+}
 
-  game_frame_delay_value =
-    (tape.playing && tape.fast_forward ? FfwdFrameDelay :
-     GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
-     GameFrameDelay);
+int map_direction_EM_to_RND(int direction)
+{
+  return (direction == 0 ? MV_UP    :
+         direction == 1 ? MV_RIGHT :
+         direction == 2 ? MV_DOWN  :
+         direction == 3 ? MV_LEFT  :
+         MV_NONE);
+}
 
-  if (tape.playing && tape.warp_forward && !tape.pausing)
-    game_frame_delay_value = 0;
+int map_element_RND_to_SP(int element_rnd)
+{
+  int element_sp = 0x20;       /* map unknown elements to yellow "hardware" */
 
-  return game_frame_delay_value;
+  if (element_rnd >= EL_SP_START &&
+      element_rnd <= EL_SP_END)
+    element_sp = element_rnd - EL_SP_START;
+  else if (element_rnd == EL_EMPTY_SPACE)
+    element_sp = 0x00;
+  else if (element_rnd == EL_INVISIBLE_WALL)
+    element_sp = 0x28;
+
+  return element_sp;
 }
 
-unsigned int InitRND(int seed)
+int map_element_SP_to_RND(int element_sp)
 {
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
-    return InitEngineRandom_EM(seed);
-  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
-    return InitEngineRandom_SP(seed);
-  else
-    return InitEngineRandom_RND(seed);
-}
+  int element_rnd = EL_UNKNOWN;
 
-#if 1
-static struct Mapping_EM_to_RND_object object_mapping[TILE_MAX];
-static struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][SPR_MAX];
-#endif
+  if (element_sp >= 0x00 &&
+      element_sp <= 0x27)
+    element_rnd = EL_SP_START + element_sp;
+  else if (element_sp == 0x28)
+    element_rnd = EL_INVISIBLE_WALL;
 
-inline static int get_effective_element_EM(int tile, int frame_em)
-{
-  int element             = object_mapping[tile].element_rnd;
-  int action              = object_mapping[tile].action;
-  boolean is_backside     = object_mapping[tile].is_backside;
-  boolean action_removing = (action == ACTION_DIGGING ||
-                            action == ACTION_SNAPPING ||
-                            action == ACTION_COLLECTING);
+  return element_rnd;
+}
 
-  if (frame_em < 7)
+int map_action_SP_to_RND(int action_sp)
+{
+  switch (action_sp)
   {
-    switch (tile)
-    {
-      case Yacid_splash_eB:
-      case Yacid_splash_wB:
-       return (frame_em > 5 ? EL_EMPTY : element);
-
-#if 0
-       /* !!! FIX !!! */
-      case Ydiamond_stone:
-       //  if (!game.use_native_emc_graphics_engine)
-       return EL_ROCK;
-#endif
+    case actActive:            return ACTION_ACTIVE;
+    case actImpact:            return ACTION_IMPACT;
+    case actExploding:         return ACTION_EXPLODING;
+    case actDigging:           return ACTION_DIGGING;
+    case actSnapping:          return ACTION_SNAPPING;
+    case actCollecting:                return ACTION_COLLECTING;
+    case actPassing:           return ACTION_PASSING;
+    case actPushing:           return ACTION_PUSHING;
+    case actDropping:          return ACTION_DROPPING;
 
-      default:
-       return element;
-    }
+    default:                   return ACTION_DEFAULT;
   }
-  else /* frame_em == 7 */
+}
+
+int get_next_element(int element)
+{
+  switch (element)
   {
-    switch (tile)
-    {
-      case Yacid_splash_eB:
-      case Yacid_splash_wB:
-       return EL_EMPTY;
+    case EL_QUICKSAND_FILLING:         return EL_QUICKSAND_FULL;
+    case EL_QUICKSAND_EMPTYING:                return EL_QUICKSAND_EMPTY;
+    case EL_QUICKSAND_FAST_FILLING:    return EL_QUICKSAND_FAST_FULL;
+    case EL_QUICKSAND_FAST_EMPTYING:   return EL_QUICKSAND_FAST_EMPTY;
+    case EL_MAGIC_WALL_FILLING:                return EL_MAGIC_WALL_FULL;
+    case EL_MAGIC_WALL_EMPTYING:       return EL_MAGIC_WALL_ACTIVE;
+    case EL_BD_MAGIC_WALL_FILLING:     return EL_BD_MAGIC_WALL_FULL;
+    case EL_BD_MAGIC_WALL_EMPTYING:    return EL_BD_MAGIC_WALL_ACTIVE;
+    case EL_DC_MAGIC_WALL_FILLING:     return EL_DC_MAGIC_WALL_FULL;
+    case EL_DC_MAGIC_WALL_EMPTYING:    return EL_DC_MAGIC_WALL_ACTIVE;
+    case EL_AMOEBA_DROPPING:           return EL_AMOEBA_WET;
 
-      case Yemerald_stone:
-       return EL_EMERALD;
+    default:                           return element;
+  }
+}
 
-      case Ydiamond_stone:
-       return EL_ROCK;
+int el_act_dir2img(int element, int action, int direction)
+{
+  element = GFX_ELEMENT(element);
+  direction = MV_DIR_TO_BIT(direction);        /* default: MV_NONE => MV_DOWN */
 
-      case Xdrip_stretch:
-      case Xdrip_stretchB:
-      case Ydrip_s1:
-      case Ydrip_s1B:
-      case Xball_1B:
-      case Xball_2:
-      case Xball_2B:
-      case Yball_eat:
-      case Ykey_1_eat:
-      case Ykey_2_eat:
-      case Ykey_3_eat:
-      case Ykey_4_eat:
-      case Ykey_5_eat:
-      case Ykey_6_eat:
-      case Ykey_7_eat:
-      case Ykey_8_eat:
-      case Ylenses_eat:
-      case Ymagnify_eat:
-      case Ygrass_eat:
-      case Ydirt_eat:
-      case Xsand_stonein_1:
-      case Xsand_stonein_2:
-      case Xsand_stonein_3:
-      case Xsand_stonein_4:
-       return element;
+  /* direction_graphic[][] == graphic[] for undefined direction graphics */
+  return element_info[element].direction_graphic[action][direction];
+}
 
-      default:
-       return (is_backside || action_removing ? EL_EMPTY : element);
-    }
-  }
+static int el_act_dir2crm(int element, int action, int direction)
+{
+  element = GFX_ELEMENT(element);
+  direction = MV_DIR_TO_BIT(direction);        /* default: MV_NONE => MV_DOWN */
+
+  /* direction_graphic[][] == graphic[] for undefined direction graphics */
+  return element_info[element].direction_crumbled[action][direction];
 }
 
-inline static boolean check_linear_animation_EM(int tile)
+int el_act2img(int element, int action)
 {
-  switch (tile)
-  {
-    case Xsand_stonesand_1:
-    case Xsand_stonesand_quickout_1:
-    case Xsand_sandstone_1:
-    case Xsand_stonein_1:
-    case Xsand_stoneout_1:
-    case Xboom_1:
-    case Xdynamite_1:
-    case Ybug_w_n:
-    case Ybug_n_e:
-    case Ybug_e_s:
-    case Ybug_s_w:
-    case Ybug_e_n:
-    case Ybug_s_e:
-    case Ybug_w_s:
-    case Ybug_n_w:
-    case Ytank_w_n:
-    case Ytank_n_e:
-    case Ytank_e_s:
-    case Ytank_s_w:
-    case Ytank_e_n:
-    case Ytank_s_e:
-    case Ytank_w_s:
-    case Ytank_n_w:
-#if 1
-    case Yacid_splash_eB:
-    case Yacid_splash_wB:
-    case Yemerald_stone:
-#endif
-      return TRUE;
-  }
+  element = GFX_ELEMENT(element);
 
-  return FALSE;
+  return element_info[element].graphic[action];
 }
 
-inline static void set_crumbled_graphics_EM(struct GraphicInfo_EM *g_em,
-                                           boolean has_crumbled_graphics,
-                                           int crumbled, int sync_frame)
+int el_act2crm(int element, int action)
 {
-  /* if element can be crumbled, but certain action graphics are just empty
-     space (like instantly snapping sand to empty space in 1 frame), do not
-     treat these empty space graphics as crumbled graphics in EMC engine */
-  if (crumbled == IMG_EMPTY_SPACE)
-    has_crumbled_graphics = FALSE;
+  element = GFX_ELEMENT(element);
 
-  if (has_crumbled_graphics)
-  {
-    struct GraphicInfo *g_crumbled = &graphic_info[crumbled];
-    int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames,
-                                          g_crumbled->anim_delay,
-                                          g_crumbled->anim_mode,
-                                          g_crumbled->anim_start_frame,
-                                          sync_frame);
+  return element_info[element].crumbled[action];
+}
 
-    getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap,
-                    &g_em->crumbled_src_x, &g_em->crumbled_src_y);
+int el_dir2img(int element, int direction)
+{
+  element = GFX_ELEMENT(element);
 
-    g_em->crumbled_border_size = graphic_info[crumbled].border_size;
+  return el_act_dir2img(element, ACTION_DEFAULT, direction);
+}
 
-    g_em->has_crumbled_graphics = TRUE;
-  }
-  else
-  {
-    g_em->crumbled_bitmap = NULL;
-    g_em->crumbled_src_x = 0;
-    g_em->crumbled_src_y = 0;
-    g_em->crumbled_border_size = 0;
+int el2baseimg(int element)
+{
+  return element_info[element].graphic[ACTION_DEFAULT];
+}
 
-    g_em->has_crumbled_graphics = FALSE;
-  }
+int el2img(int element)
+{
+  element = GFX_ELEMENT(element);
+
+  return element_info[element].graphic[ACTION_DEFAULT];
 }
 
-void ResetGfxAnimation_EM(int x, int y, int tile)
+int el2edimg(int element)
 {
-  GfxFrame[x][y] = 0;
+  element = GFX_ELEMENT(element);
+
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
 }
 
-void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em,
-                       int tile, int frame_em, int x, int y)
+int el2preimg(int element)
 {
-  int action = object_mapping[tile].action;
-#if 1
-  int direction = object_mapping[tile].direction;
-  int effective_element = get_effective_element_EM(tile, frame_em);
-  int graphic = (direction == MV_NONE ?
-                el_act2img(effective_element, action) :
-                el_act_dir2img(effective_element, action, direction));
-  struct GraphicInfo *g = &graphic_info[graphic];
-  int sync_frame;
-#endif
-  boolean action_removing = (action == ACTION_DIGGING ||
-                            action == ACTION_SNAPPING ||
-                            action == ACTION_COLLECTING);
-  boolean action_moving   = (action == ACTION_FALLING ||
-                            action == ACTION_MOVING ||
-                            action == ACTION_PUSHING ||
-                            action == ACTION_EATING ||
-                            action == ACTION_FILLING ||
-                            action == ACTION_EMPTYING);
-  boolean action_falling  = (action == ACTION_FALLING ||
-                            action == ACTION_FILLING ||
-                            action == ACTION_EMPTYING);
+  element = GFX_ELEMENT(element);
 
-  /* special case: graphic uses "2nd movement tile" and has defined
-     7 frames for movement animation (or less) => use default graphic
-     for last (8th) frame which ends the movement animation */
-  if (g->double_movement && g->anim_frames < 8 && frame_em == 7)
-  {
-    action = ACTION_DEFAULT;   /* (keep action_* unchanged for now) */
-    graphic = (direction == MV_NONE ?
-              el_act2img(effective_element, action) :
-              el_act_dir2img(effective_element, action, direction));
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
+}
 
-    g = &graphic_info[graphic];
-  }
+int el2panelimg(int element)
+{
+  element = GFX_ELEMENT(element);
 
-#if 0
-  if (tile == Xsand_stonesand_1 ||
-      tile == Xsand_stonesand_2 ||
-      tile == Xsand_stonesand_3 ||
-      tile == Xsand_stonesand_4)
-    printf("::: 1: quicksand frame %d [%d]\n", GfxFrame[x][y], tile);
-#endif
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PANEL];
+}
 
-#if 1
-  if ((action_removing || check_linear_animation_EM(tile)) && frame_em == 0)
-  {
-    GfxFrame[x][y] = 0;
+int font2baseimg(int font_nr)
+{
+  return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
+}
 
-    // printf("::: resetting... [%d]\n", tile);
-  }
-#else
-  if (action_removing || check_linear_animation_EM(tile))
-  {
-    GfxFrame[x][y] = frame_em;
+int getBeltNrFromBeltElement(int element)
+{
+  return (element < EL_CONVEYOR_BELT_2_LEFT ? 0 :
+         element < EL_CONVEYOR_BELT_3_LEFT ? 1 :
+         element < EL_CONVEYOR_BELT_4_LEFT ? 2 : 3);
+}
 
-    // printf("::: resetting... [%d]\n", tile);
-  }
-#endif
-  else if (action_moving)
-  {
-    boolean is_backside = object_mapping[tile].is_backside;
+int getBeltNrFromBeltActiveElement(int element)
+{
+  return (element < EL_CONVEYOR_BELT_2_LEFT_ACTIVE ? 0 :
+         element < EL_CONVEYOR_BELT_3_LEFT_ACTIVE ? 1 :
+         element < EL_CONVEYOR_BELT_4_LEFT_ACTIVE ? 2 : 3);
+}
 
-    if (is_backside)
-    {
-      int direction = object_mapping[tile].direction;
-      int move_dir = (action_falling ? MV_DOWN : direction);
+int getBeltNrFromBeltSwitchElement(int element)
+{
+  return (element < EL_CONVEYOR_BELT_2_SWITCH_LEFT ? 0 :
+         element < EL_CONVEYOR_BELT_3_SWITCH_LEFT ? 1 :
+         element < EL_CONVEYOR_BELT_4_SWITCH_LEFT ? 2 : 3);
+}
 
-      GfxFrame[x][y]++;
+int getBeltDirNrFromBeltElement(int element)
+{
+  static int belt_base_element[4] =
+  {
+    EL_CONVEYOR_BELT_1_LEFT,
+    EL_CONVEYOR_BELT_2_LEFT,
+    EL_CONVEYOR_BELT_3_LEFT,
+    EL_CONVEYOR_BELT_4_LEFT
+  };
 
-#if 1
-      /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */
-      if (g->double_movement && frame_em == 0)
-      {
-       GfxFrame[x][y] = 0;
+  int belt_nr = getBeltNrFromBeltElement(element);
+  int belt_dir_nr = element - belt_base_element[belt_nr];
 
-       // printf("::: resetting... [%d]\n", tile);
-      }
-#endif
+  return (belt_dir_nr % 3);
+}
 
-      if (move_dir == MV_LEFT)
-       GfxFrame[x - 1][y] = GfxFrame[x][y];
-      else if (move_dir == MV_RIGHT)
-       GfxFrame[x + 1][y] = GfxFrame[x][y];
-      else if (move_dir == MV_UP)
-       GfxFrame[x][y - 1] = GfxFrame[x][y];
-      else if (move_dir == MV_DOWN)
-       GfxFrame[x][y + 1] = GfxFrame[x][y];
-    }
-  }
-  else
+int getBeltDirNrFromBeltSwitchElement(int element)
+{
+  static int belt_base_element[4] =
   {
-    GfxFrame[x][y]++;
-
-    /* special case: animation for Xsand_stonesand_quickout_1/2 twice as fast */
-    if (tile == Xsand_stonesand_quickout_1 ||
-       tile == Xsand_stonesand_quickout_2)
-      GfxFrame[x][y]++;
-  }
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT
+  };
 
-#if 0
-  if (tile == Xsand_stonesand_1 ||
-      tile == Xsand_stonesand_2 ||
-      tile == Xsand_stonesand_3 ||
-      tile == Xsand_stonesand_4)
-    printf("::: 2: quicksand frame %d [%d]\n", GfxFrame[x][y], tile);
-#endif
+  int belt_nr = getBeltNrFromBeltSwitchElement(element);
+  int belt_dir_nr = element - belt_base_element[belt_nr];
 
-#if 1
-  if (graphic_info[graphic].anim_global_sync)
-    sync_frame = FrameCounter;
-  else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY))
-    sync_frame = GfxFrame[x][y];
-  else
-    sync_frame = 0;    /* playfield border (pseudo steel) */
+  return (belt_dir_nr % 3);
+}
 
-  SetRandomAnimationValue(x, y);
+int getBeltDirFromBeltElement(int element)
+{
+  static int belt_move_dir[3] =
+  {
+    MV_LEFT,
+    MV_NONE,
+    MV_RIGHT
+  };
 
-  int frame = getAnimationFrame(g->anim_frames,
-                               g->anim_delay,
-                               g->anim_mode,
-                               g->anim_start_frame,
-                               sync_frame);
+  int belt_dir_nr = getBeltDirNrFromBeltElement(element);
 
-  g_em->unique_identifier =
-    (graphic << 16) | ((frame % 8) << 12) | (g_em->width << 6) | g_em->height;
-#endif
+  return belt_move_dir[belt_dir_nr];
 }
 
-void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em,
-                                 int tile, int frame_em, int x, int y)
+int getBeltDirFromBeltSwitchElement(int element)
 {
-  int action = object_mapping[tile].action;
-  int direction = object_mapping[tile].direction;
-  boolean is_backside = object_mapping[tile].is_backside;
-  int effective_element = get_effective_element_EM(tile, frame_em);
-#if 1
-  int effective_action = action;
-#else
-  int effective_action = (frame_em < 7 ? action : ACTION_DEFAULT);
-#endif
-  int graphic = (direction == MV_NONE ?
-                el_act2img(effective_element, effective_action) :
-                el_act_dir2img(effective_element, effective_action,
-                               direction));
-  int crumbled = (direction == MV_NONE ?
-                 el_act2crm(effective_element, effective_action) :
-                 el_act_dir2crm(effective_element, effective_action,
-                                direction));
-  int base_graphic = el_act2img(effective_element, ACTION_DEFAULT);
-  int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT);
-  boolean has_crumbled_graphics = (base_crumbled != base_graphic);
-  struct GraphicInfo *g = &graphic_info[graphic];
-#if 0
-  struct GraphicInfo *g_crumbled = &graphic_info[crumbled];
-#endif
-  int sync_frame;
-
-  /* special case: graphic uses "2nd movement tile" and has defined
-     7 frames for movement animation (or less) => use default graphic
-     for last (8th) frame which ends the movement animation */
-  if (g->double_movement && g->anim_frames < 8 && frame_em == 7)
+  static int belt_move_dir[3] =
   {
-    effective_action = ACTION_DEFAULT;
-    graphic = (direction == MV_NONE ?
-              el_act2img(effective_element, effective_action) :
-              el_act_dir2img(effective_element, effective_action,
-                             direction));
-    crumbled = (direction == MV_NONE ?
-               el_act2crm(effective_element, effective_action) :
-               el_act_dir2crm(effective_element, effective_action,
-                              direction));
-
-    g = &graphic_info[graphic];
-  }
+    MV_LEFT,
+    MV_NONE,
+    MV_RIGHT
+  };
 
-#if 0
-  if (frame_em == 7)
-    return;
-#endif
+  int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(element);
 
+  return belt_move_dir[belt_dir_nr];
+}
 
-#if 0
-  if (frame_em == 0)   /* reset animation frame for certain elements */
+int getBeltElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr)
+{
+  static int belt_base_element[4] =
   {
-    if (check_linear_animation_EM(tile))
-      GfxFrame[x][y] = 0;
-  }
-#endif
+    EL_CONVEYOR_BELT_1_LEFT,
+    EL_CONVEYOR_BELT_2_LEFT,
+    EL_CONVEYOR_BELT_3_LEFT,
+    EL_CONVEYOR_BELT_4_LEFT
+  };
 
-  if (graphic_info[graphic].anim_global_sync)
-    sync_frame = FrameCounter;
-  else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY))
-    sync_frame = GfxFrame[x][y];
-  else
-    sync_frame = 0;    /* playfield border (pseudo steel) */
+  return belt_base_element[belt_nr] + belt_dir_nr;
+}
 
-  SetRandomAnimationValue(x, y);
+int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
+{
+  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
 
-#if 0
-  int i = tile;
-  int j = frame_em;
-  int xxx_sync_frame = (i == Xdrip_stretch ? 7 :
-                       i == Xdrip_stretchB ? 7 :
-                       i == Ydrip_s2 ? j + 8 :
-                       i == Ydrip_s2B ? j + 8 :
-                       i == Xacid_1 ? 0 :
-                       i == Xacid_2 ? 10 :
-                       i == Xacid_3 ? 20 :
-                       i == Xacid_4 ? 30 :
-                       i == Xacid_5 ? 40 :
-                       i == Xacid_6 ? 50 :
-                       i == Xacid_7 ? 60 :
-                       i == Xacid_8 ? 70 :
-                       i == Xfake_acid_1 ? 0 :
-                       i == Xfake_acid_2 ? 10 :
-                       i == Xfake_acid_3 ? 20 :
-                       i == Xfake_acid_4 ? 30 :
-                       i == Xfake_acid_5 ? 40 :
-                       i == Xfake_acid_6 ? 50 :
-                       i == Xfake_acid_7 ? 60 :
-                       i == Xfake_acid_8 ? 70 :
-                       i == Xball_2 ? 7 :
-                       i == Xball_2B ? j + 8 :
-                       i == Yball_eat ? j + 1 :
-                       i == Ykey_1_eat ? j + 1 :
-                       i == Ykey_2_eat ? j + 1 :
-                       i == Ykey_3_eat ? j + 1 :
-                       i == Ykey_4_eat ? j + 1 :
-                       i == Ykey_5_eat ? j + 1 :
-                       i == Ykey_6_eat ? j + 1 :
-                       i == Ykey_7_eat ? j + 1 :
-                       i == Ykey_8_eat ? j + 1 :
-                       i == Ylenses_eat ? j + 1 :
-                       i == Ymagnify_eat ? j + 1 :
-                       i == Ygrass_eat ? j + 1 :
-                       i == Ydirt_eat ? j + 1 :
-                       i == Xamoeba_1 ? 0 :
-                       i == Xamoeba_2 ? 1 :
-                       i == Xamoeba_3 ? 2 :
-                       i == Xamoeba_4 ? 3 :
-                       i == Xamoeba_5 ? 0 :
-                       i == Xamoeba_6 ? 1 :
-                       i == Xamoeba_7 ? 2 :
-                       i == Xamoeba_8 ? 3 :
-                       i == Xexit_2 ? j + 8 :
-                       i == Xexit_3 ? j + 16 :
-                       i == Xdynamite_1 ? 0 :
-                       i == Xdynamite_2 ? 8 :
-                       i == Xdynamite_3 ? 16 :
-                       i == Xdynamite_4 ? 24 :
-                       i == Xsand_stonein_1 ? j + 1 :
-                       i == Xsand_stonein_2 ? j + 9 :
-                       i == Xsand_stonein_3 ? j + 17 :
-                       i == Xsand_stonein_4 ? j + 25 :
-                       i == Xsand_stoneout_1 && j == 0 ? 0 :
-                       i == Xsand_stoneout_1 && j == 1 ? 0 :
-                       i == Xsand_stoneout_1 && j == 2 ? 1 :
-                       i == Xsand_stoneout_1 && j == 3 ? 2 :
-                       i == Xsand_stoneout_1 && j == 4 ? 2 :
-                       i == Xsand_stoneout_1 && j == 5 ? 3 :
-                       i == Xsand_stoneout_1 && j == 6 ? 4 :
-                       i == Xsand_stoneout_1 && j == 7 ? 4 :
-                       i == Xsand_stoneout_2 && j == 0 ? 5 :
-                       i == Xsand_stoneout_2 && j == 1 ? 6 :
-                       i == Xsand_stoneout_2 && j == 2 ? 7 :
-                       i == Xsand_stoneout_2 && j == 3 ? 8 :
-                       i == Xsand_stoneout_2 && j == 4 ? 9 :
-                       i == Xsand_stoneout_2 && j == 5 ? 11 :
-                       i == Xsand_stoneout_2 && j == 6 ? 13 :
-                       i == Xsand_stoneout_2 && j == 7 ? 15 :
-                       i == Xboom_bug && j == 1 ? 2 :
-                       i == Xboom_bug && j == 2 ? 2 :
-                       i == Xboom_bug && j == 3 ? 4 :
-                       i == Xboom_bug && j == 4 ? 4 :
-                       i == Xboom_bug && j == 5 ? 2 :
-                       i == Xboom_bug && j == 6 ? 2 :
-                       i == Xboom_bug && j == 7 ? 0 :
-                       i == Xboom_bomb && j == 1 ? 2 :
-                       i == Xboom_bomb && j == 2 ? 2 :
-                       i == Xboom_bomb && j == 3 ? 4 :
-                       i == Xboom_bomb && j == 4 ? 4 :
-                       i == Xboom_bomb && j == 5 ? 2 :
-                       i == Xboom_bomb && j == 6 ? 2 :
-                       i == Xboom_bomb && j == 7 ? 0 :
-                       i == Xboom_android && j == 7 ? 6 :
-                       i == Xboom_1 && j == 1 ? 2 :
-                       i == Xboom_1 && j == 2 ? 2 :
-                       i == Xboom_1 && j == 3 ? 4 :
-                       i == Xboom_1 && j == 4 ? 4 :
-                       i == Xboom_1 && j == 5 ? 6 :
-                       i == Xboom_1 && j == 6 ? 6 :
-                       i == Xboom_1 && j == 7 ? 8 :
-                       i == Xboom_2 && j == 0 ? 8 :
-                       i == Xboom_2 && j == 1 ? 8 :
-                       i == Xboom_2 && j == 2 ? 10 :
-                       i == Xboom_2 && j == 3 ? 10 :
-                       i == Xboom_2 && j == 4 ? 10 :
-                       i == Xboom_2 && j == 5 ? 12 :
-                       i == Xboom_2 && j == 6 ? 12 :
-                       i == Xboom_2 && j == 7 ? 12 :
-#if 0
-                       special_animation && j == 4 ? 3 :
-                       effective_action != action ? 0 :
-#endif
-                       j);
-#endif
+  return getBeltElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
+}
+
+int getBeltSwitchElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr)
+{
+  static int belt_base_element[4] =
+  {
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT
+  };
 
-#if 0
-  int xxx_effective_action;
-  int xxx_has_action_graphics;
+  return belt_base_element[belt_nr] + belt_dir_nr;
+}
+
+int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
+{
+  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
+
+  return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
+}
+
+boolean getTeamMode_EM()
+{
+  return game.team_mode;
+}
+
+int getGameFrameDelay_EM(int native_em_game_frame_delay)
+{
+  int game_frame_delay_value;
+
+  game_frame_delay_value =
+    (tape.playing && tape.fast_forward ? FfwdFrameDelay :
+     GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
+     GameFrameDelay);
+
+  if (tape.playing && tape.warp_forward && !tape.pausing)
+    game_frame_delay_value = 0;
+
+  return game_frame_delay_value;
+}
+
+unsigned int InitRND(int seed)
+{
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    return InitEngineRandom_EM(seed);
+  else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    return InitEngineRandom_SP(seed);
+  else
+    return InitEngineRandom_RND(seed);
+}
+
+static struct Mapping_EM_to_RND_object object_mapping[TILE_MAX];
+static struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][SPR_MAX];
+
+inline static int get_effective_element_EM(int tile, int frame_em)
+{
+  int element             = object_mapping[tile].element_rnd;
+  int action              = object_mapping[tile].action;
+  boolean is_backside     = object_mapping[tile].is_backside;
+  boolean action_removing = (action == ACTION_DIGGING ||
+                            action == ACTION_SNAPPING ||
+                            action == ACTION_COLLECTING);
 
+  if (frame_em < 7)
   {
-    int element = object_mapping[i].element_rnd;
-    int action = object_mapping[i].action;
-    int direction = object_mapping[i].direction;
-    boolean is_backside = object_mapping[i].is_backside;
-#if 0
-    boolean action_removing = (action == ACTION_DIGGING ||
-                              action == ACTION_SNAPPING ||
-                              action == ACTION_COLLECTING);
-#endif
-    boolean action_exploding = ((action == ACTION_EXPLODING ||
-                                action == ACTION_SMASHED_BY_ROCK ||
-                                action == ACTION_SMASHED_BY_SPRING) &&
-                               element != EL_DIAMOND);
-    boolean action_active = (action == ACTION_ACTIVE);
-    boolean action_other = (action == ACTION_OTHER);
+    switch (tile)
+    {
+      case Yacid_splash_eB:
+      case Yacid_splash_wB:
+       return (frame_em > 5 ? EL_EMPTY : element);
 
+      default:
+       return element;
+    }
+  }
+  else /* frame_em == 7 */
+  {
+    switch (tile)
     {
-#if 1
-      int effective_element = get_effective_element_EM(i, j);
-#else
-      int effective_element = (j > 5 && i == Yacid_splash_eB ? EL_EMPTY :
-                              j > 5 && i == Yacid_splash_wB ? EL_EMPTY :
-                              j < 7 ? element :
-                              i == Xdrip_stretch ? element :
-                              i == Xdrip_stretchB ? element :
-                              i == Ydrip_s1 ? element :
-                              i == Ydrip_s1B ? element :
-                              i == Xball_1B ? element :
-                              i == Xball_2 ? element :
-                              i == Xball_2B ? element :
-                              i == Yball_eat ? element :
-                              i == Ykey_1_eat ? element :
-                              i == Ykey_2_eat ? element :
-                              i == Ykey_3_eat ? element :
-                              i == Ykey_4_eat ? element :
-                              i == Ykey_5_eat ? element :
-                              i == Ykey_6_eat ? element :
-                              i == Ykey_7_eat ? element :
-                              i == Ykey_8_eat ? element :
-                              i == Ylenses_eat ? element :
-                              i == Ymagnify_eat ? element :
-                              i == Ygrass_eat ? element :
-                              i == Ydirt_eat ? element :
-                              i == Yemerald_stone ? EL_EMERALD :
-                              i == Ydiamond_stone ? EL_ROCK :
-                              i == Xsand_stonein_1 ? element :
-                              i == Xsand_stonein_2 ? element :
-                              i == Xsand_stonein_3 ? element :
-                              i == Xsand_stonein_4 ? element :
-                              is_backside ? EL_EMPTY :
-                              action_removing ? EL_EMPTY :
-                              element);
-#endif
-      int effective_action = (j < 7 ? action :
-                             i == Xdrip_stretch ? action :
-                             i == Xdrip_stretchB ? action :
-                             i == Ydrip_s1 ? action :
-                             i == Ydrip_s1B ? action :
-                             i == Xball_1B ? action :
-                             i == Xball_2 ? action :
-                             i == Xball_2B ? action :
-                             i == Yball_eat ? action :
-                             i == Ykey_1_eat ? action :
-                             i == Ykey_2_eat ? action :
-                             i == Ykey_3_eat ? action :
-                             i == Ykey_4_eat ? action :
-                             i == Ykey_5_eat ? action :
-                             i == Ykey_6_eat ? action :
-                             i == Ykey_7_eat ? action :
-                             i == Ykey_8_eat ? action :
-                             i == Ylenses_eat ? action :
-                             i == Ymagnify_eat ? action :
-                             i == Ygrass_eat ? action :
-                             i == Ydirt_eat ? action :
-                             i == Xsand_stonein_1 ? action :
-                             i == Xsand_stonein_2 ? action :
-                             i == Xsand_stonein_3 ? action :
-                             i == Xsand_stonein_4 ? action :
-                             i == Xsand_stoneout_1 ? action :
-                             i == Xsand_stoneout_2 ? action :
-                             i == Xboom_android ? ACTION_EXPLODING :
-                             action_exploding ? ACTION_EXPLODING :
-                             action_active ? action :
-                             action_other ? action :
-                             ACTION_DEFAULT);
-      int graphic = (el_act_dir2img(effective_element, effective_action,
-                                   direction));
-      int crumbled = (el_act_dir2crm(effective_element, effective_action,
-                                    direction));
-      int base_graphic = el_act2img(effective_element, ACTION_DEFAULT);
-      int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT);
-      boolean has_action_graphics = (graphic != base_graphic);
-      boolean has_crumbled_graphics = (base_crumbled != base_graphic);
-      struct GraphicInfo *g = &graphic_info[graphic];
-#if 0
-      struct GraphicInfo *g_crumbled = &graphic_info[crumbled];
-#endif
-      struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j];
-      Bitmap *src_bitmap;
-      int src_x, src_y;
-      /* ensure to get symmetric 3-frame, 2-delay animations as used in EM */
-      boolean special_animation = (action != ACTION_DEFAULT &&
-                                  g->anim_frames == 3 &&
-                                  g->anim_delay == 2 &&
-                                  g->anim_mode & ANIM_LINEAR);
-      xxx_sync_frame = (i == Xdrip_stretch ? 7 :
-                       i == Xdrip_stretchB ? 7 :
-                       i == Ydrip_s2 ? j + 8 :
-                       i == Ydrip_s2B ? j + 8 :
-                       i == Xacid_1 ? 0 :
-                       i == Xacid_2 ? 10 :
-                       i == Xacid_3 ? 20 :
-                       i == Xacid_4 ? 30 :
-                       i == Xacid_5 ? 40 :
-                       i == Xacid_6 ? 50 :
-                       i == Xacid_7 ? 60 :
-                       i == Xacid_8 ? 70 :
-                       i == Xfake_acid_1 ? 0 :
-                       i == Xfake_acid_2 ? 10 :
-                       i == Xfake_acid_3 ? 20 :
-                       i == Xfake_acid_4 ? 30 :
-                       i == Xfake_acid_5 ? 40 :
-                       i == Xfake_acid_6 ? 50 :
-                       i == Xfake_acid_7 ? 60 :
-                       i == Xfake_acid_8 ? 70 :
-                       i == Xball_2 ? 7 :
-                       i == Xball_2B ? j + 8 :
-                       i == Yball_eat ? j + 1 :
-                       i == Ykey_1_eat ? j + 1 :
-                       i == Ykey_2_eat ? j + 1 :
-                       i == Ykey_3_eat ? j + 1 :
-                       i == Ykey_4_eat ? j + 1 :
-                       i == Ykey_5_eat ? j + 1 :
-                       i == Ykey_6_eat ? j + 1 :
-                       i == Ykey_7_eat ? j + 1 :
-                       i == Ykey_8_eat ? j + 1 :
-                       i == Ylenses_eat ? j + 1 :
-                       i == Ymagnify_eat ? j + 1 :
-                       i == Ygrass_eat ? j + 1 :
-                       i == Ydirt_eat ? j + 1 :
-                       i == Xamoeba_1 ? 0 :
-                       i == Xamoeba_2 ? 1 :
-                       i == Xamoeba_3 ? 2 :
-                       i == Xamoeba_4 ? 3 :
-                       i == Xamoeba_5 ? 0 :
-                       i == Xamoeba_6 ? 1 :
-                       i == Xamoeba_7 ? 2 :
-                       i == Xamoeba_8 ? 3 :
-                       i == Xexit_2 ? j + 8 :
-                       i == Xexit_3 ? j + 16 :
-                       i == Xdynamite_1 ? 0 :
-                       i == Xdynamite_2 ? 8 :
-                       i == Xdynamite_3 ? 16 :
-                       i == Xdynamite_4 ? 24 :
-                       i == Xsand_stonein_1 ? j + 1 :
-                       i == Xsand_stonein_2 ? j + 9 :
-                       i == Xsand_stonein_3 ? j + 17 :
-                       i == Xsand_stonein_4 ? j + 25 :
-                       i == Xsand_stoneout_1 && j == 0 ? 0 :
-                       i == Xsand_stoneout_1 && j == 1 ? 0 :
-                       i == Xsand_stoneout_1 && j == 2 ? 1 :
-                       i == Xsand_stoneout_1 && j == 3 ? 2 :
-                       i == Xsand_stoneout_1 && j == 4 ? 2 :
-                       i == Xsand_stoneout_1 && j == 5 ? 3 :
-                       i == Xsand_stoneout_1 && j == 6 ? 4 :
-                       i == Xsand_stoneout_1 && j == 7 ? 4 :
-                       i == Xsand_stoneout_2 && j == 0 ? 5 :
-                       i == Xsand_stoneout_2 && j == 1 ? 6 :
-                       i == Xsand_stoneout_2 && j == 2 ? 7 :
-                       i == Xsand_stoneout_2 && j == 3 ? 8 :
-                       i == Xsand_stoneout_2 && j == 4 ? 9 :
-                       i == Xsand_stoneout_2 && j == 5 ? 11 :
-                       i == Xsand_stoneout_2 && j == 6 ? 13 :
-                       i == Xsand_stoneout_2 && j == 7 ? 15 :
-                       i == Xboom_bug && j == 1 ? 2 :
-                       i == Xboom_bug && j == 2 ? 2 :
-                       i == Xboom_bug && j == 3 ? 4 :
-                       i == Xboom_bug && j == 4 ? 4 :
-                       i == Xboom_bug && j == 5 ? 2 :
-                       i == Xboom_bug && j == 6 ? 2 :
-                       i == Xboom_bug && j == 7 ? 0 :
-                       i == Xboom_bomb && j == 1 ? 2 :
-                       i == Xboom_bomb && j == 2 ? 2 :
-                       i == Xboom_bomb && j == 3 ? 4 :
-                       i == Xboom_bomb && j == 4 ? 4 :
-                       i == Xboom_bomb && j == 5 ? 2 :
-                       i == Xboom_bomb && j == 6 ? 2 :
-                       i == Xboom_bomb && j == 7 ? 0 :
-                       i == Xboom_android && j == 7 ? 6 :
-                       i == Xboom_1 && j == 1 ? 2 :
-                       i == Xboom_1 && j == 2 ? 2 :
-                       i == Xboom_1 && j == 3 ? 4 :
-                       i == Xboom_1 && j == 4 ? 4 :
-                       i == Xboom_1 && j == 5 ? 6 :
-                       i == Xboom_1 && j == 6 ? 6 :
-                       i == Xboom_1 && j == 7 ? 8 :
-                       i == Xboom_2 && j == 0 ? 8 :
-                       i == Xboom_2 && j == 1 ? 8 :
-                       i == Xboom_2 && j == 2 ? 10 :
-                       i == Xboom_2 && j == 3 ? 10 :
-                       i == Xboom_2 && j == 4 ? 10 :
-                       i == Xboom_2 && j == 5 ? 12 :
-                       i == Xboom_2 && j == 6 ? 12 :
-                       i == Xboom_2 && j == 7 ? 12 :
-                       special_animation && j == 4 ? 3 :
-                       effective_action != action ? 0 :
-                       j);
+      case Yacid_splash_eB:
+      case Yacid_splash_wB:
+       return EL_EMPTY;
+
+      case Yemerald_stone:
+       return EL_EMERALD;
+
+      case Ydiamond_stone:
+       return EL_ROCK;
+
+      case Xdrip_stretch:
+      case Xdrip_stretchB:
+      case Ydrip_s1:
+      case Ydrip_s1B:
+      case Xball_1B:
+      case Xball_2:
+      case Xball_2B:
+      case Yball_eat:
+      case Ykey_1_eat:
+      case Ykey_2_eat:
+      case Ykey_3_eat:
+      case Ykey_4_eat:
+      case Ykey_5_eat:
+      case Ykey_6_eat:
+      case Ykey_7_eat:
+      case Ykey_8_eat:
+      case Ylenses_eat:
+      case Ymagnify_eat:
+      case Ygrass_eat:
+      case Ydirt_eat:
+      case Xsand_stonein_1:
+      case Xsand_stonein_2:
+      case Xsand_stonein_3:
+      case Xsand_stonein_4:
+       return element;
 
-      xxx_effective_action = effective_action;
-      xxx_has_action_graphics = has_action_graphics;
+      default:
+       return (is_backside || action_removing ? EL_EMPTY : element);
     }
   }
-#endif
+}
 
-  int frame = getAnimationFrame(g->anim_frames,
-                               g->anim_delay,
-                               g->anim_mode,
-                               g->anim_start_frame,
-                               sync_frame);
+inline static boolean check_linear_animation_EM(int tile)
+{
+  switch (tile)
+  {
+    case Xsand_stonesand_1:
+    case Xsand_stonesand_quickout_1:
+    case Xsand_sandstone_1:
+    case Xsand_stonein_1:
+    case Xsand_stoneout_1:
+    case Xboom_1:
+    case Xdynamite_1:
+    case Ybug_w_n:
+    case Ybug_n_e:
+    case Ybug_e_s:
+    case Ybug_s_w:
+    case Ybug_e_n:
+    case Ybug_s_e:
+    case Ybug_w_s:
+    case Ybug_n_w:
+    case Ytank_w_n:
+    case Ytank_n_e:
+    case Ytank_e_s:
+    case Ytank_s_w:
+    case Ytank_e_n:
+    case Ytank_s_e:
+    case Ytank_w_s:
+    case Ytank_n_w:
+    case Yacid_splash_eB:
+    case Yacid_splash_wB:
+    case Yemerald_stone:
+      return TRUE;
+  }
 
+  return FALSE;
+}
 
-#if 0
-  return;
-#endif
+inline static void set_crumbled_graphics_EM(struct GraphicInfo_EM *g_em,
+                                           boolean has_crumbled_graphics,
+                                           int crumbled, int sync_frame)
+{
+  /* if element can be crumbled, but certain action graphics are just empty
+     space (like instantly snapping sand to empty space in 1 frame), do not
+     treat these empty space graphics as crumbled graphics in EMC engine */
+  if (crumbled == IMG_EMPTY_SPACE)
+    has_crumbled_graphics = FALSE;
 
-#if 0
-  if (frame_em == 7)
-    return;
-#endif
+  if (has_crumbled_graphics)
+  {
+    struct GraphicInfo *g_crumbled = &graphic_info[crumbled];
+    int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames,
+                                          g_crumbled->anim_delay,
+                                          g_crumbled->anim_mode,
+                                          g_crumbled->anim_start_frame,
+                                          sync_frame);
 
-#if 0
-  int old_src_x = g_em->src_x;
-  int old_src_y = g_em->src_y;
-#endif
+    getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap,
+                    &g_em->crumbled_src_x, &g_em->crumbled_src_y);
 
-#if 1
-  getGraphicSourceExt(graphic, frame, &g_em->bitmap, &g_em->src_x, &g_em->src_y,
-                     g->double_movement && is_backside);
-#else
-  getGraphicSourceExt(graphic, frame, &g_em->bitmap,
-                     &g_em->src_x, &g_em->src_y, FALSE);
-#endif
+    g_em->crumbled_border_size = graphic_info[crumbled].border_size;
 
+    g_em->has_crumbled_graphics = TRUE;
+  }
+  else
+  {
+    g_em->crumbled_bitmap = NULL;
+    g_em->crumbled_src_x = 0;
+    g_em->crumbled_src_y = 0;
+    g_em->crumbled_border_size = 0;
 
-#if 0
-  if (tile == Ydiamond_stone)
-    printf("::: stone smashing diamond... %d: %d, %d, %d, %d, %d -> %d [%d, %d, %d, %d, %d, %d] [%d]\n",
-          frame_em,
-          g->anim_frames,
-          g->anim_delay,
-          g->anim_mode,
-          g->anim_start_frame,
-          sync_frame,
-          frame,
-          g_em->src_x, g_em->src_y,
-          g_em->src_offset_x, g_em->src_offset_y,
-          g_em->dst_offset_x, g_em->dst_offset_y,
-          graphic);
-#endif
+    g_em->has_crumbled_graphics = FALSE;
+  }
+}
 
+void ResetGfxAnimation_EM(int x, int y, int tile)
+{
+  GfxFrame[x][y] = 0;
+}
 
-#if 0
-  return;
-#endif
+void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em,
+                       int tile, int frame_em, int x, int y)
+{
+  int action = object_mapping[tile].action;
+  int direction = object_mapping[tile].direction;
+  int effective_element = get_effective_element_EM(tile, frame_em);
+  int graphic = (direction == MV_NONE ?
+                el_act2img(effective_element, action) :
+                el_act_dir2img(effective_element, action, direction));
+  struct GraphicInfo *g = &graphic_info[graphic];
+  int sync_frame;
+  boolean action_removing = (action == ACTION_DIGGING ||
+                            action == ACTION_SNAPPING ||
+                            action == ACTION_COLLECTING);
+  boolean action_moving   = (action == ACTION_FALLING ||
+                            action == ACTION_MOVING ||
+                            action == ACTION_PUSHING ||
+                            action == ACTION_EATING ||
+                            action == ACTION_FILLING ||
+                            action == ACTION_EMPTYING);
+  boolean action_falling  = (action == ACTION_FALLING ||
+                            action == ACTION_FILLING ||
+                            action == ACTION_EMPTYING);
 
-#if 0
-  if (frame_em == 7)
+  /* special case: graphic uses "2nd movement tile" and has defined
+     7 frames for movement animation (or less) => use default graphic
+     for last (8th) frame which ends the movement animation */
+  if (g->double_movement && g->anim_frames < 8 && frame_em == 7)
   {
-    if (graphic == IMG_BUG_MOVING_RIGHT)
-      printf("::: %d, %d, %d: %d, %d [%d, %d -> %d, %d]\n", graphic, x, y,
-            g->double_movement, is_backside,
-            old_src_x, old_src_y, g_em->src_x, g_em->src_y);
+    action = ACTION_DEFAULT;   /* (keep action_* unchanged for now) */
+    graphic = (direction == MV_NONE ?
+              el_act2img(effective_element, action) :
+              el_act_dir2img(effective_element, action, direction));
 
-    return;
+    g = &graphic_info[graphic];
   }
-#endif
 
+  if ((action_removing || check_linear_animation_EM(tile)) && frame_em == 0)
+  {
+    GfxFrame[x][y] = 0;
+  }
+  else if (action_moving)
+  {
+    boolean is_backside = object_mapping[tile].is_backside;
 
-#if 0
-  g_em->src_offset_x = 0;
-  g_em->src_offset_y = 0;
-  g_em->dst_offset_x = 0;
-  g_em->dst_offset_y = 0;
-  g_em->width  = TILEX;
-  g_em->height = TILEY;
-
-  g_em->preserve_background = FALSE;
-#endif
+    if (is_backside)
+    {
+      int direction = object_mapping[tile].direction;
+      int move_dir = (action_falling ? MV_DOWN : direction);
+
+      GfxFrame[x][y]++;
 
-  /* (updating the "crumbled" graphic definitions is probably not really needed,
-     as animations for crumbled graphics can't be longer than one EMC cycle) */
 #if 1
-  set_crumbled_graphics_EM(g_em, has_crumbled_graphics, crumbled,
-                          sync_frame);
+      /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */
+      if (g->double_movement && frame_em == 0)
+       GfxFrame[x][y] = 0;
+#endif
 
-#else
+      if (move_dir == MV_LEFT)
+       GfxFrame[x - 1][y] = GfxFrame[x][y];
+      else if (move_dir == MV_RIGHT)
+       GfxFrame[x + 1][y] = GfxFrame[x][y];
+      else if (move_dir == MV_UP)
+       GfxFrame[x][y - 1] = GfxFrame[x][y];
+      else if (move_dir == MV_DOWN)
+       GfxFrame[x][y + 1] = GfxFrame[x][y];
+    }
+  }
+  else
+  {
+    GfxFrame[x][y]++;
+
+    /* special case: animation for Xsand_stonesand_quickout_1/2 twice as fast */
+    if (tile == Xsand_stonesand_quickout_1 ||
+       tile == Xsand_stonesand_quickout_2)
+      GfxFrame[x][y]++;
+  }
 
-  g_em->crumbled_bitmap = NULL;
-  g_em->crumbled_src_x = 0;
-  g_em->crumbled_src_y = 0;
+  if (graphic_info[graphic].anim_global_sync)
+    sync_frame = FrameCounter;
+  else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY))
+    sync_frame = GfxFrame[x][y];
+  else
+    sync_frame = 0;    /* playfield border (pseudo steel) */
 
-  g_em->has_crumbled_graphics = FALSE;
+  SetRandomAnimationValue(x, y);
 
-  if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE)
-  {
-    int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames,
-                                          g_crumbled->anim_delay,
-                                          g_crumbled->anim_mode,
-                                          g_crumbled->anim_start_frame,
-                                          sync_frame);
+  int frame = getAnimationFrame(g->anim_frames,
+                               g->anim_delay,
+                               g->anim_mode,
+                               g->anim_start_frame,
+                               sync_frame);
 
-    getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap,
-                    &g_em->crumbled_src_x, &g_em->crumbled_src_y);
+  g_em->unique_identifier =
+    (graphic << 16) | ((frame % 8) << 12) | (g_em->width << 6) | g_em->height;
+}
 
-    g_em->has_crumbled_graphics = TRUE;
-  }
-#endif
+void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em,
+                                 int tile, int frame_em, int x, int y)
+{
+  int action = object_mapping[tile].action;
+  int direction = object_mapping[tile].direction;
+  boolean is_backside = object_mapping[tile].is_backside;
+  int effective_element = get_effective_element_EM(tile, frame_em);
+  int effective_action = action;
+  int graphic = (direction == MV_NONE ?
+                el_act2img(effective_element, effective_action) :
+                el_act_dir2img(effective_element, effective_action,
+                               direction));
+  int crumbled = (direction == MV_NONE ?
+                 el_act2crm(effective_element, effective_action) :
+                 el_act_dir2crm(effective_element, effective_action,
+                                direction));
+  int base_graphic = el_act2img(effective_element, ACTION_DEFAULT);
+  int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT);
+  boolean has_crumbled_graphics = (base_crumbled != base_graphic);
+  struct GraphicInfo *g = &graphic_info[graphic];
+  int sync_frame;
 
-#if 0
- {
-   int effective_action = xxx_effective_action;
-   int has_action_graphics = xxx_has_action_graphics;
+  /* special case: graphic uses "2nd movement tile" and has defined
+     7 frames for movement animation (or less) => use default graphic
+     for last (8th) frame which ends the movement animation */
+  if (g->double_movement && g->anim_frames < 8 && frame_em == 7)
+  {
+    effective_action = ACTION_DEFAULT;
+    graphic = (direction == MV_NONE ?
+              el_act2img(effective_element, effective_action) :
+              el_act_dir2img(effective_element, effective_action,
+                             direction));
+    crumbled = (direction == MV_NONE ?
+               el_act2crm(effective_element, effective_action) :
+               el_act_dir2crm(effective_element, effective_action,
+                              direction));
+
+    g = &graphic_info[graphic];
+  }
 
-      if ((!g->double_movement && (effective_action == ACTION_FALLING ||
-                                  effective_action == ACTION_MOVING  ||
-                                  effective_action == ACTION_PUSHING ||
-                                  effective_action == ACTION_EATING)) ||
-         (!has_action_graphics && (effective_action == ACTION_FILLING ||
-                                   effective_action == ACTION_EMPTYING)))
-      {
-       int move_dir =
-         (effective_action == ACTION_FALLING ||
-          effective_action == ACTION_FILLING ||
-          effective_action == ACTION_EMPTYING ? MV_DOWN : direction);
-       int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? 1 : 0);
-       int dy = (move_dir == MV_UP   ? -1 : move_dir == MV_DOWN  ? 1 : 0);
-       int num_steps = (i == Ydrip_s1  ? 16 :
-                        i == Ydrip_s1B ? 16 :
-                        i == Ydrip_s2  ? 16 :
-                        i == Ydrip_s2B ? 16 :
-                        i == Xsand_stonein_1 ? 32 :
-                        i == Xsand_stonein_2 ? 32 :
-                        i == Xsand_stonein_3 ? 32 :
-                        i == Xsand_stonein_4 ? 32 :
-                        i == Xsand_stoneout_1 ? 16 :
-                        i == Xsand_stoneout_2 ? 16 : 8);
-       int cx = ABS(dx) * (TILEX / num_steps);
-       int cy = ABS(dy) * (TILEY / num_steps);
-       int step_frame = (i == Ydrip_s2         ? j + 8 :
-                         i == Ydrip_s2B        ? j + 8 :
-                         i == Xsand_stonein_2  ? j + 8 :
-                         i == Xsand_stonein_3  ? j + 16 :
-                         i == Xsand_stonein_4  ? j + 24 :
-                         i == Xsand_stoneout_2 ? j + 8 : j) + 1;
-       int step = (is_backside ? step_frame : num_steps - step_frame);
+  if (graphic_info[graphic].anim_global_sync)
+    sync_frame = FrameCounter;
+  else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY))
+    sync_frame = GfxFrame[x][y];
+  else
+    sync_frame = 0;    /* playfield border (pseudo steel) */
 
-       if (is_backside)        /* tile where movement starts */
-       {
-         if (dx < 0 || dy < 0)
-         {
-           g_em->src_offset_x = cx * step;
-           g_em->src_offset_y = cy * step;
-         }
-         else
-         {
-           g_em->dst_offset_x = cx * step;
-           g_em->dst_offset_y = cy * step;
-         }
-       }
-       else                    /* tile where movement ends */
-       {
-         if (dx < 0 || dy < 0)
-         {
-           g_em->dst_offset_x = cx * step;
-           g_em->dst_offset_y = cy * step;
-         }
-         else
-         {
-           g_em->src_offset_x = cx * step;
-           g_em->src_offset_y = cy * step;
-         }
-       }
+  SetRandomAnimationValue(x, y);
 
-       g_em->width  = TILEX - cx * step;
-       g_em->height = TILEY - cy * step;
-      }
+  int frame = getAnimationFrame(g->anim_frames,
+                               g->anim_delay,
+                               g->anim_mode,
+                               g->anim_start_frame,
+                               sync_frame);
 
-      /* create unique graphic identifier to decide if tile must be redrawn */
-      /* bit 31 - 16 (16 bit): EM style graphic
-        bit 15 - 12 ( 4 bit): EM style frame
-        bit 11 -  6 ( 6 bit): graphic width
-        bit  5 -  0 ( 6 bit): graphic height */
-      g_em->unique_identifier =
-       (graphic << 16) | (frame << 12) | (g_em->width << 6) | g_em->height;
- }
-#endif
+  getGraphicSourceExt(graphic, frame, &g_em->bitmap, &g_em->src_x, &g_em->src_y,
+                     g->double_movement && is_backside);
 
+  /* (updating the "crumbled" graphic definitions is probably not really needed,
+     as animations for crumbled graphics can't be longer than one EMC cycle) */
+  set_crumbled_graphics_EM(g_em, has_crumbled_graphics, crumbled,
+                          sync_frame);
 }
 
 void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *g_em,
@@ -10320,22 +7327,10 @@ void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *g_em,
 
   getGraphicSourceExt(graphic, frame, &g_em->bitmap,
                      &g_em->src_x, &g_em->src_y, FALSE);
-
-#if 0
-  printf("::: %d: %d, %d [%d]\n",
-        player_nr,
-        stored_player[player_nr].Frame,
-        stored_player[player_nr].StepFrame,
-        FrameCounter);
-#endif
 }
 
 void InitGraphicInfo_EM(void)
 {
-#if 0
-  struct Mapping_EM_to_RND_object object_mapping[TILE_MAX];
-  struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][SPR_MAX];
-#endif
   int i, j, p;
 
 #if DEBUG_EM_GFX
@@ -10407,11 +7402,6 @@ void InitGraphicInfo_EM(void)
     int action = object_mapping[i].action;
     int direction = object_mapping[i].direction;
     boolean is_backside = object_mapping[i].is_backside;
-#if 0
-    boolean action_removing = (action == ACTION_DIGGING ||
-                              action == ACTION_SNAPPING ||
-                              action == ACTION_COLLECTING);
-#endif
     boolean action_exploding = ((action == ACTION_EXPLODING ||
                                 action == ACTION_SMASHED_BY_ROCK ||
                                 action == ACTION_SMASHED_BY_SPRING) &&
@@ -10421,42 +7411,7 @@ void InitGraphicInfo_EM(void)
 
     for (j = 0; j < 8; j++)
     {
-#if 1
       int effective_element = get_effective_element_EM(i, j);
-#else
-      int effective_element = (j > 5 && i == Yacid_splash_eB ? EL_EMPTY :
-                              j > 5 && i == Yacid_splash_wB ? EL_EMPTY :
-                              j < 7 ? element :
-                              i == Xdrip_stretch ? element :
-                              i == Xdrip_stretchB ? element :
-                              i == Ydrip_s1 ? element :
-                              i == Ydrip_s1B ? element :
-                              i == Xball_1B ? element :
-                              i == Xball_2 ? element :
-                              i == Xball_2B ? element :
-                              i == Yball_eat ? element :
-                              i == Ykey_1_eat ? element :
-                              i == Ykey_2_eat ? element :
-                              i == Ykey_3_eat ? element :
-                              i == Ykey_4_eat ? element :
-                              i == Ykey_5_eat ? element :
-                              i == Ykey_6_eat ? element :
-                              i == Ykey_7_eat ? element :
-                              i == Ykey_8_eat ? element :
-                              i == Ylenses_eat ? element :
-                              i == Ymagnify_eat ? element :
-                              i == Ygrass_eat ? element :
-                              i == Ydirt_eat ? element :
-                              i == Yemerald_stone ? EL_EMERALD :
-                              i == Ydiamond_stone ? EL_ROCK :
-                              i == Xsand_stonein_1 ? element :
-                              i == Xsand_stonein_2 ? element :
-                              i == Xsand_stonein_3 ? element :
-                              i == Xsand_stonein_4 ? element :
-                              is_backside ? EL_EMPTY :
-                              action_removing ? EL_EMPTY :
-                              element);
-#endif
       int effective_action = (j < 7 ? action :
                              i == Xdrip_stretch ? action :
                              i == Xdrip_stretchB ? action :
@@ -10498,9 +7453,6 @@ void InitGraphicInfo_EM(void)
       boolean has_action_graphics = (graphic != base_graphic);
       boolean has_crumbled_graphics = (base_crumbled != base_graphic);
       struct GraphicInfo *g = &graphic_info[graphic];
-#if 0
-      struct GraphicInfo *g_crumbled = &graphic_info[crumbled];
-#endif
       struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j];
       Bitmap *src_bitmap;
       int src_x, src_y;
@@ -10639,75 +7591,9 @@ void InitGraphicInfo_EM(void)
 
       g_em->preserve_background = FALSE;
 
-#if 1
       set_crumbled_graphics_EM(g_em, has_crumbled_graphics, crumbled,
                               sync_frame);
 
-#else
-
-      g_em->crumbled_bitmap = NULL;
-      g_em->crumbled_src_x = 0;
-      g_em->crumbled_src_y = 0;
-      g_em->crumbled_border_size = 0;
-
-      g_em->has_crumbled_graphics = FALSE;
-
-#if 0
-      if (has_crumbled_graphics && crumbled == IMG_EMPTY_SPACE)
-       printf("::: empty crumbled: %d [%s], %d, %d\n",
-              effective_element, element_info[effective_element].token_name,
-              effective_action, direction);
-#endif
-
-      /* if element can be crumbled, but certain action graphics are just empty
-        space (like instantly snapping sand to empty space in 1 frame), do not
-        treat these empty space graphics as crumbled graphics in EMC engine */
-      if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE)
-      {
-       int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames,
-                                              g_crumbled->anim_delay,
-                                              g_crumbled->anim_mode,
-                                              g_crumbled->anim_start_frame,
-                                              sync_frame);
-
-       getGraphicSource(crumbled, frame_crumbled, &src_bitmap, &src_x, &src_y);
-
-       g_em->has_crumbled_graphics = TRUE;
-       g_em->crumbled_bitmap = src_bitmap;
-       g_em->crumbled_src_x = src_x;
-       g_em->crumbled_src_y = src_y;
-       g_em->crumbled_border_size = graphic_info[crumbled].border_size;
-
-
-#if 0
-       if (g_em == &graphic_info_em_object[207][0])
-         printf("... %d, %d [%d, %d, %d, %d] [%d, %d, %d, %d, %d, %d => %d]\n",
-                graphic_info_em_object[207][0].crumbled_src_x,
-                graphic_info_em_object[207][0].crumbled_src_y,
-
-                crumbled, frame, src_x, src_y,
-
-                g->anim_frames,
-                g->anim_delay,
-                g->anim_mode,
-                g->anim_start_frame,
-                sync_frame,
-                gfx.anim_random_frame,
-                frame);
-#endif
-
-#if 0
-       printf("::: EMC tile %d is crumbled\n", i);
-#endif
-      }
-#endif
-
-#if 0
-      if (element == EL_ROCK &&
-         effective_action == ACTION_FILLING)
-       printf("::: has_action_graphics == %d\n", has_action_graphics);
-#endif
-
       if ((!g->double_movement && (effective_action == ACTION_FALLING ||
                                   effective_action == ACTION_MOVING  ||
                                   effective_action == ACTION_PUSHING ||
@@ -10998,47 +7884,71 @@ void InitGraphicInfo_EM(void)
 #endif
 }
 
-void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
-                           boolean any_player_moving,
-                           boolean player_is_dropping)
+void CheckSaveEngineSnapshot_EM(byte action[MAX_PLAYERS], int frame,
+                               boolean any_player_moving,
+                               boolean any_player_snapping,
+                               boolean any_player_dropping)
 {
-  if (tape.single_step && tape.recording && !tape.pausing)
-  {
-#if 0
-    boolean active_players = FALSE;
-    int i;
+  static boolean player_was_waiting = TRUE;
 
-    for (i = 0; i < MAX_PLAYERS; i++)
-      if (action[i] != JOY_NO_ACTION)
-       active_players = TRUE;
-#endif
+  if (frame == 0 && !any_player_dropping)
+  {
+    if (!player_was_waiting)
+    {
+      if (!SaveEngineSnapshotToList())
+       return;
 
-    // if (frame == 0)
-    if (frame == 0 && !player_is_dropping)
-      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+      player_was_waiting = TRUE;
+    }
+  }
+  else if (any_player_moving || any_player_snapping || any_player_dropping)
+  {
+    player_was_waiting = FALSE;
   }
 }
 
-void CheckSingleStepMode_SP(boolean murphy_is_waiting,
-                           boolean murphy_is_dropping)
+void CheckSaveEngineSnapshot_SP(boolean murphy_is_waiting,
+                               boolean murphy_is_dropping)
 {
-#if 0
-  printf("::: waiting: %d, dropping: %d\n",
-        murphy_is_waiting, murphy_is_dropping);
-#endif
+  static boolean player_was_waiting = TRUE;
 
-  if (tape.single_step && tape.recording && !tape.pausing)
+  if (murphy_is_waiting)
   {
-    // if (murphy_is_waiting || murphy_is_dropping)
-    if (murphy_is_waiting)
+    if (!player_was_waiting)
     {
-#if 0
-      printf("::: murphy is waiting -> pause mode\n");
-#endif
+      if (!SaveEngineSnapshotToList())
+       return;
 
-      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+      player_was_waiting = TRUE;
     }
   }
+  else
+  {
+    player_was_waiting = FALSE;
+  }
+}
+
+void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
+                           boolean any_player_moving,
+                           boolean any_player_snapping,
+                           boolean any_player_dropping)
+{
+  if (tape.single_step && tape.recording && !tape.pausing)
+    if (frame == 0 && !any_player_dropping)
+      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+
+  CheckSaveEngineSnapshot_EM(action, frame, any_player_moving,
+                            any_player_snapping, any_player_dropping);
+}
+
+void CheckSingleStepMode_SP(boolean murphy_is_waiting,
+                           boolean murphy_is_dropping)
+{
+  if (tape.single_step && tape.recording && !tape.pausing)
+    if (murphy_is_waiting)
+      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+
+  CheckSaveEngineSnapshot_SP(murphy_is_waiting, murphy_is_dropping);
 }
 
 void getGraphicSource_SP(struct GraphicInfo_SP *g_sp,
@@ -11209,32 +8119,36 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
 
     FreeBitmap(tmp_backbuffer);
 
-#if 1
     /* update visible window/screen */
     BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
-#else
-    redraw_mask = REDRAW_ALL;
-#endif
   }
 }
 
+void JoinRectangles(int *x, int *y, int *width, int *height,
+                   int x2, int y2, int width2, int height2)
+{
+  // do not join with "off-screen" rectangle
+  if (x2 == -1 || y2 == -1)
+    return;
+
+  *x = MIN(*x, x2);
+  *y = MIN(*y, y2);
+  *width = MAX(*width, width2);
+  *height = MAX(*height, height2);
+}
+
 void ChangeViewportPropertiesIfNeeded()
 {
-#if 0
-  int *door_1_x = &DX;
-  int *door_1_y = &DY;
-  int *door_2_x = (game_status == GAME_MODE_EDITOR ? &EX : &VX);
-  int *door_2_y = (game_status == GAME_MODE_EDITOR ? &EY : &VY);
-#endif
-  int gfx_game_mode = (game_status == GAME_MODE_PLAYING ||
-                      game_status == GAME_MODE_EDITOR ? game_status :
-                      GAME_MODE_MAIN);
+  int gfx_game_mode = game_status;
   int gfx_game_mode2 = (game_status == GAME_MODE_EDITOR ? GAME_MODE_DEFAULT :
                        game_status);
+  struct RectWithBorder *vp_window    = &viewport.window[gfx_game_mode];
   struct RectWithBorder *vp_playfield = &viewport.playfield[gfx_game_mode];
-  struct RectWithBorder *vp_door_1 = &viewport.door_1[gfx_game_mode];
-  struct RectWithBorder *vp_door_2 = &viewport.door_2[gfx_game_mode2];
-  struct RectWithBorder *vp_door_3 = &viewport.door_2[GAME_MODE_EDITOR];
+  struct RectWithBorder *vp_door_1    = &viewport.door_1[gfx_game_mode];
+  struct RectWithBorder *vp_door_2    = &viewport.door_2[gfx_game_mode2];
+  struct RectWithBorder *vp_door_3    = &viewport.door_2[GAME_MODE_EDITOR];
+  int new_win_xsize    = vp_window->width;
+  int new_win_ysize    = vp_window->height;
   int border_size      = vp_playfield->border_size;
   int new_sx           = vp_playfield->x + border_size;
   int new_sy           = vp_playfield->y + border_size;
@@ -11256,48 +8170,28 @@ void ChangeViewportPropertiesIfNeeded()
   int new_ey           = vp_door_3->y;
   int new_exsize       = vp_door_3->width;
   int new_eysize       = vp_door_3->height;
-#if NEW_TILESIZE
-  int new_tilesize_var = TILESIZE / (setup.small_game_graphics ? 2 : 1);
+  int new_tilesize_var =
+    (setup.small_game_graphics ? MINI_TILESIZE : game.tile_size);
+
   int tilesize = (gfx_game_mode == GAME_MODE_PLAYING ? new_tilesize_var :
                  gfx_game_mode == GAME_MODE_EDITOR ? MINI_TILESIZE : TILESIZE);
   int new_scr_fieldx = new_sxsize / tilesize;
   int new_scr_fieldy = new_sysize / tilesize;
   int new_scr_fieldx_buffers = new_sxsize / new_tilesize_var;
   int new_scr_fieldy_buffers = new_sysize / new_tilesize_var;
-#else
-  int new_scr_fieldx = (vp_playfield->width  - 2 * border_size) / TILESIZE;
-  int new_scr_fieldy = (vp_playfield->height - 2 * border_size) / TILESIZE;
-#endif
   boolean init_gfx_buffers = FALSE;
   boolean init_video_buffer = FALSE;
   boolean init_gadgets_and_toons = FALSE;
+  boolean init_em_graphics = FALSE;
 
-#if 0
-  /* !!! TEST ONLY !!! */
-  // InitGfxBuffers();
-  return;
-#endif
-
-  if (viewport.window.width  != WIN_XSIZE ||
-      viewport.window.height != WIN_YSIZE)
+  if (new_win_xsize != WIN_XSIZE ||
+      new_win_ysize != WIN_YSIZE)
   {
-    WIN_XSIZE = viewport.window.width;
-    WIN_YSIZE = viewport.window.height;
+    WIN_XSIZE = new_win_xsize;
+    WIN_YSIZE = new_win_ysize;
 
-#if 1
     init_video_buffer = TRUE;
     init_gfx_buffers = TRUE;
-#else
-    InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
-    InitGfxBuffers();
-
-#if 1
-    SetDrawDeactivationMask(REDRAW_NONE);
-    SetDrawBackgroundMask(REDRAW_FIELD);
-
-    // RedrawBackground();
-#endif
-#endif
 
     // printf("::: video: init_video_buffer, init_gfx_buffers\n");
   }
@@ -11313,20 +8207,6 @@ void ChangeViewportPropertiesIfNeeded()
     // printf("::: new_scr_fieldx != SCR_FIELDX ...\n");
   }
 
-#if 0
-  if (new_tilesize_var != TILESIZE_VAR &&
-      gfx_game_mode == GAME_MODE_PLAYING)
-  {
-    /* doing this outside GAME_MODE_PLAYING would give wrong playfield size */
-
-    TILESIZE_VAR = new_tilesize_var;
-
-    init_gfx_buffers = TRUE;
-
-    // printf("::: tilesize: init_gfx_buffers\n");
-  }
-#endif
-
   if (new_sx != SX ||
       new_sy != SY ||
       new_dx != DX ||
@@ -11348,15 +8228,61 @@ void ChangeViewportPropertiesIfNeeded()
       new_full_sxsize != FULL_SXSIZE ||
       new_full_sysize != FULL_SYSIZE ||
       new_tilesize_var != TILESIZE_VAR
-#if 0
-      ||
-      vp_door_1->x != *door_1_x ||
-      vp_door_1->y != *door_1_y ||
-      vp_door_2->x != *door_2_x ||
-      vp_door_2->y != *door_2_y
-#endif
       )
   {
+    // ------------------------------------------------------------------------
+    // determine next fading area for changed viewport definitions
+    // ------------------------------------------------------------------------
+
+    // start with current playfield area (default fading area)
+    FADE_SX = REAL_SX;
+    FADE_SY = REAL_SY;
+    FADE_SXSIZE = FULL_SXSIZE;
+    FADE_SYSIZE = FULL_SYSIZE;
+
+    // add new playfield area if position or size has changed
+    if (new_real_sx != REAL_SX || new_real_sy != REAL_SY ||
+       new_full_sxsize != FULL_SXSIZE || new_full_sysize != FULL_SYSIZE)
+    {
+      JoinRectangles(&FADE_SX, &FADE_SY, &FADE_SXSIZE, &FADE_SYSIZE,
+                    new_real_sx, new_real_sy, new_full_sxsize,new_full_sysize);
+    }
+
+    // add current and new door 1 area if position or size has changed
+    if (new_dx != DX || new_dy != DY ||
+       new_dxsize != DXSIZE || new_dysize != DYSIZE)
+    {
+      JoinRectangles(&FADE_SX, &FADE_SY, &FADE_SXSIZE, &FADE_SYSIZE,
+                    DX, DY, DXSIZE, DYSIZE);
+      JoinRectangles(&FADE_SX, &FADE_SY, &FADE_SXSIZE, &FADE_SYSIZE,
+                    new_dx, new_dy, new_dxsize, new_dysize);
+    }
+
+    // add current and new door 2 area if position or size has changed
+    if (new_dx != VX || new_dy != VY ||
+       new_dxsize != VXSIZE || new_dysize != VYSIZE)
+    {
+      JoinRectangles(&FADE_SX, &FADE_SY, &FADE_SXSIZE, &FADE_SYSIZE,
+                    VX, VY, VXSIZE, VYSIZE);
+      JoinRectangles(&FADE_SX, &FADE_SY, &FADE_SXSIZE, &FADE_SYSIZE,
+                    new_vx, new_vy, new_vxsize, new_vysize);
+    }
+
+    // ------------------------------------------------------------------------
+    // handle changed tile size
+    // ------------------------------------------------------------------------
+
+    if (new_tilesize_var != TILESIZE_VAR)
+    {
+      // printf("::: new_tilesize_var != TILESIZE_VAR\n");
+
+      // changing tile size invalidates scroll values of engine snapshots
+      FreeEngineSnapshotSingle();
+
+      // changing tile size requires update of graphic mapping for EM engine
+      init_em_graphics = TRUE;
+    }
+
     SX = new_sx;
     SY = new_sy;
     DX = new_dx;
@@ -11379,40 +8305,11 @@ void ChangeViewportPropertiesIfNeeded()
     FULL_SYSIZE = new_full_sysize;
     TILESIZE_VAR = new_tilesize_var;
 
-#if 0
-    printf("::: %d, %d, %d [%d]\n",
-          SCR_FIELDX, SCR_FIELDY, TILESIZE_VAR,
-          setup.small_game_graphics);
-#endif
-
-#if 0
-    *door_1_x = vp_door_1->x;
-    *door_1_y = vp_door_1->y;
-    *door_2_x = vp_door_2->x;
-    *door_2_y = vp_door_2->y;
-#endif
-
-#if 1
     init_gfx_buffers = TRUE;
+    init_gadgets_and_toons = TRUE;
 
     // printf("::: viewports: init_gfx_buffers\n");
-#else
-    InitGfxBuffers();
-#endif
-
-#if 0
-    if (gfx_game_mode == GAME_MODE_MAIN)
-#endif
-    {
-#if 1
-      init_gadgets_and_toons = TRUE;
-
-      // printf("::: viewports: init_gadgets_and_toons\n");
-#else
-      InitGadgets();
-      InitToons();
-#endif
-    }
+    // printf("::: viewports: init_gadgets_and_toons\n");
   }
 
   if (init_gfx_buffers)
@@ -11426,6 +8323,9 @@ void ChangeViewportPropertiesIfNeeded()
 
     SCR_FIELDX = new_scr_fieldx;
     SCR_FIELDY = new_scr_fieldy;
+
+    SetDrawDeactivationMask(REDRAW_NONE);
+    SetDrawBackgroundMask(REDRAW_FIELD);
   }
 
   if (init_video_buffer)
@@ -11433,9 +8333,6 @@ void ChangeViewportPropertiesIfNeeded()
     // printf("::: init_video_buffer\n");
 
     InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
-
-    SetDrawDeactivationMask(REDRAW_NONE);
-    SetDrawBackgroundMask(REDRAW_FIELD);
   }
 
   if (init_gadgets_and_toons)
@@ -11446,7 +8343,8 @@ void ChangeViewportPropertiesIfNeeded()
     InitToons();
   }
 
-#if 0
-  printf("::: %d, %d  /  %d, %d [%d]\n", VX, VY, EX, EY, game_status);
-#endif
+  if (init_em_graphics)
+  {
+      InitGraphicInfo_EM();
+  }
 }