fixed fading complete screen if playfield viewport has changed
[rocksndiamonds.git] / src / tools.c
index 2c3fb9cde5e622989b23541e2df7b083fb90839d..2838908d99e93954787d83d96547b9df58cb95e2 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>
 
 #include "init.h"
 #include "game.h"
 #include "events.h"
-#include "cartoons.h"
+#include "anim.h"
 #include "network.h"
 #include "tape.h"
 #include "screens.h"
 
 
 /* select level set with EMC X11 graphics before activating EM GFX debugging */
-#define DEBUG_EM_GFX   0
+#define DEBUG_EM_GFX           FALSE
+#define DEBUG_FRAME_TIME       FALSE
 
 /* tool button identifiers */
 #define TOOL_CTRL_ID_YES       0
@@ -67,83 +66,83 @@ static struct DoorPartControlInfo door_part_controls[] =
 {
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_1,
+    IMG_GFX_DOOR_1_PART_1,
     &door_1.part_1
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_2,
+    IMG_GFX_DOOR_1_PART_2,
     &door_1.part_2
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_3,
+    IMG_GFX_DOOR_1_PART_3,
     &door_1.part_3
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_4,
+    IMG_GFX_DOOR_1_PART_4,
     &door_1.part_4
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_5,
+    IMG_GFX_DOOR_1_PART_5,
     &door_1.part_5
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_6,
+    IMG_GFX_DOOR_1_PART_6,
     &door_1.part_6
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_7,
+    IMG_GFX_DOOR_1_PART_7,
     &door_1.part_7
   },
   {
     DOOR_1,
-    IMG_DOOR_1_GFX_PART_8,
+    IMG_GFX_DOOR_1_PART_8,
     &door_1.part_8
   },
 
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_1,
+    IMG_GFX_DOOR_2_PART_1,
     &door_2.part_1
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_2,
+    IMG_GFX_DOOR_2_PART_2,
     &door_2.part_2
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_3,
+    IMG_GFX_DOOR_2_PART_3,
     &door_2.part_3
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_4,
+    IMG_GFX_DOOR_2_PART_4,
     &door_2.part_4
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_5,
+    IMG_GFX_DOOR_2_PART_5,
     &door_2.part_5
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_6,
+    IMG_GFX_DOOR_2_PART_6,
     &door_2.part_6
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_7,
+    IMG_GFX_DOOR_2_PART_7,
     &door_2.part_7
   },
   {
     DOOR_2,
-    IMG_DOOR_2_GFX_PART_8,
+    IMG_GFX_DOOR_2_PART_8,
     &door_2.part_8
   },
 
@@ -193,17 +192,232 @@ static char *print_if_not_empty(int element)
   return s;
 }
 
-void DumpTile(int x, int y)
+int correctLevelPosX_EM(int lx)
 {
-  int sx = SCREENX(x);
-  int sy = SCREENY(y);
+  lx -= 1;
+  lx -= (BorderElement != EL_EMPTY ? 1 : 0);
 
-  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+  return lx;
+}
+
+int correctLevelPosY_EM(int ly)
+{
+  ly -= 1;
+  ly -= (BorderElement != EL_EMPTY ? 1 : 0);
+
+  return ly;
+}
+
+static int getFieldbufferOffsetX_RND()
+{
+  int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0);
+  int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
+  int dx_var = dx * TILESIZE_VAR / TILESIZE;
+  int fx = FX;
+
+  if (EVEN(SCR_FIELDX))
+  {
+    int ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
+
+    if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
+      fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
+    else
+      fx += (dx_var > 0 ? TILEX_VAR : 0);
+  }
+  else
+  {
+    fx += dx_var;
+  }
+
+  if (full_lev_fieldx <= SCR_FIELDX)
+  {
+    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);
+  }
+
+  return fx;
+}
+
+static int getFieldbufferOffsetY_RND()
+{
+  int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0);
+  int dy = (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
+  int dy_var = dy * TILESIZE_VAR / TILESIZE;
+  int fy = FY;
+
+  if (EVEN(SCR_FIELDY))
+  {
+    int ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
+
+    if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR)
+      fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR;
+    else
+      fy += (dy_var > 0 ? TILEY_VAR : 0);
+  }
+  else
+  {
+    fy += dy_var;
+  }
+
+  if (full_lev_fieldy <= SCR_FIELDY)
   {
-    x--;
-    y--;
+    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);
   }
 
+  return fy;
+}
+
+static int getLevelFromScreenX_RND(int sx)
+{
+  int fx = getFieldbufferOffsetX_RND();
+  int dx = fx - FX;
+  int px = sx - SX;
+  int lx = LEVELX((px + dx) / TILESIZE_VAR);
+
+  return lx;
+}
+
+static int getLevelFromScreenY_RND(int sy)
+{
+  int fy = getFieldbufferOffsetY_RND();
+  int dy = fy - FY;
+  int py = sy - SY;
+  int ly = LEVELY((py + dy) / TILESIZE_VAR);
+
+  return ly;
+}
+
+static int getLevelFromScreenX_EM(int sx)
+{
+  int level_xsize = level.native_em_level->lev->width;
+  int full_xsize = level_xsize * TILESIZE_VAR;
+
+  sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
+
+  int fx = getFieldbufferOffsetX_EM();
+  int dx = fx;
+  int px = sx - SX;
+  int lx = LEVELX((px + dx) / TILESIZE_VAR);
+
+  lx = correctLevelPosX_EM(lx);
+
+  return lx;
+}
+
+static int getLevelFromScreenY_EM(int sy)
+{
+  int level_ysize = level.native_em_level->lev->height;
+  int full_ysize = level_ysize * TILESIZE_VAR;
+
+  sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
+
+  int fy = getFieldbufferOffsetY_EM();
+  int dy = fy;
+  int py = sy - SY;
+  int ly = LEVELY((py + dy) / TILESIZE_VAR);
+
+  ly = correctLevelPosY_EM(ly);
+
+  return ly;
+}
+
+static int getLevelFromScreenX_SP(int sx)
+{
+  int menBorder = setup.sp_show_border_elements;
+  int level_xsize = level.native_sp_level->width;
+  int full_xsize = (level_xsize - (menBorder ? 0 : 1)) * TILESIZE_VAR;
+
+  sx += (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
+
+  int fx = getFieldbufferOffsetX_SP();
+  int dx = fx - FX;
+  int px = sx - SX;
+  int lx = LEVELX((px + dx) / TILESIZE_VAR);
+
+  return lx;
+}
+
+static int getLevelFromScreenY_SP(int sy)
+{
+  int menBorder = setup.sp_show_border_elements;
+  int level_ysize = level.native_sp_level->height;
+  int full_ysize = (level_ysize - (menBorder ? 0 : 1)) * TILESIZE_VAR;
+
+  sy += (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
+
+  int fy = getFieldbufferOffsetY_SP();
+  int dy = fy - FY;
+  int py = sy - SY;
+  int ly = LEVELY((py + dy) / TILESIZE_VAR);
+
+  return ly;
+}
+
+static int getLevelFromScreenX_MM(int sx)
+{
+#if 0
+  int level_xsize = level.native_mm_level->fieldx;
+  int full_xsize = level_xsize * TILESIZE_VAR;
+
+  sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
+#endif
+
+  int px = sx - SX;
+  int lx = px / TILESIZE_VAR;
+
+  return lx;
+}
+
+static int getLevelFromScreenY_MM(int sy)
+{
+#if 0
+  int level_ysize = level.native_mm_level->fieldy;
+  int full_ysize = level_ysize * TILESIZE_VAR;
+
+  sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
+#endif
+
+  int py = sy - SY;
+  int ly = py / TILESIZE_VAR;
+
+  return ly;
+}
+
+int getLevelFromScreenX(int x)
+{
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    return getLevelFromScreenX_EM(x);
+  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    return getLevelFromScreenX_SP(x);
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return getLevelFromScreenX_MM(x);
+  else
+    return getLevelFromScreenX_RND(x);
+}
+
+int getLevelFromScreenY(int y)
+{
+  if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
+    return getLevelFromScreenY_EM(y);
+  if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
+    return getLevelFromScreenY_SP(y);
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return getLevelFromScreenY_MM(y);
+  else
+    return getLevelFromScreenY_RND(y);
+}
+
+void DumpTile(int x, int y)
+{
+  int sx = SCREENX(x);
+  int sy = SCREENY(y);
+  char *token_name;
+
   printf_line("-", 79);
   printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
   printf_line("-", 79);
@@ -216,8 +430,9 @@ void DumpTile(int x, int y)
     return;
   }
 
-  printf("  Feld:        %d\t['%s']\n", Feld[x][y],
-        element_info[Feld[x][y]].token_name);
+  token_name = element_info[Feld[x][y]].token_name;
+
+  printf("  Feld:        %d\t['%s']\n", Feld[x][y], token_name);
   printf("  Back:        %s\n", print_if_not_empty(Back[x][y]));
   printf("  Store:       %s\n", print_if_not_empty(Store[x][y]));
   printf("  Store2:      %s\n", print_if_not_empty(Store2[x][y]));
@@ -229,59 +444,33 @@ 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("  Player x/y:  %d, %d\n", local_player->jx, local_player->jy);
   printf("\n");
 }
 
+void DumpTileFromScreen(int sx, int sy)
+{
+  int lx = getLevelFromScreenX(sx);
+  int ly = getLevelFromScreenY(sy);
+
+  DumpTile(lx, ly);
+}
+
 void SetDrawtoField(int mode)
 {
-  if (mode == DRAW_BUFFERED && setup.soft_scrolling)
+  if (mode == DRAW_TO_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;
   }
-  else /* DRAW_BACKBUFFER */
+  else /* DRAW_TO_BACKBUFFER */
   {
     FX = SX;
     FY = SY;
@@ -289,53 +478,18 @@ void SetDrawtoField(int mode)
     BY1 = 0;
     BX2 = SCR_FIELDX - 1;
     BY2 = SCR_FIELDY - 1;
-    redraw_x1 = 0;
-    redraw_y1 = 0;
 
     drawto_field = backbuffer;
   }
 }
 
-#if 1
-
 static void RedrawPlayfield_RND()
 {
   if (game.envelope_active)
     return;
 
-#if 1
   DrawLevel(REDRAW_ALL);
-#else
-  int x, y;
-
-  SetMainBackgroundImage(IMG_BACKGROUND_PLAYING);
-  // SetDrawBackgroundMask(REDRAW_FIELD);      // !!! CHECK THIS !!!
-  SetDrawBackgroundMask(REDRAW_ALL);   // !!! CHECK THIS !!!
-
-  for (x = BX1; x <= BX2; x++)
-    for (y = BY1; y <= BY2; y++)
-      DrawScreenField(x, y);
-
-  redraw_mask |= REDRAW_FIELD;
-#endif
   DrawAllPlayers();
-
-#if 0
-#if NEW_TILESIZE
-  BlitScreenToBitmap(backbuffer);
-#else
-  /* blit playfield from scroll buffer to normal back buffer */
-  if (setup.soft_scrolling)
-  {
-    int fx = FX, fy = FY;
-
-    fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
-    fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
-
-    BlitBitmap(fieldbuffer, backbuffer, fx,fy, SXSIZE,SYSIZE, SX,SY);
-  }
-#endif
-#endif
 }
 
 void RedrawPlayfield()
@@ -347,6 +501,8 @@ void RedrawPlayfield()
     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_MM)
+    RedrawPlayfield_MM();
   else if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
     RedrawPlayfield_RND();
 
@@ -356,243 +512,136 @@ void RedrawPlayfield()
             gfx.sx, gfx.sy);
 }
 
-#else
-
-void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
+static void DrawMaskedBorderExt_Rect(int x, int y, int width, int height,
+                                    int draw_target)
 {
-  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 (setup.soft_scrolling)
-    {
-      int fx = FX, fy = FY;
-
-      fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
-      fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
-
-      BlitBitmap(fieldbuffer, backbuffer, fx,fy, SXSIZE,SYSIZE, SX,SY);
-    }
-  }
-
-  if (force_redraw)
-  {
-    x = gfx.sx;
-    y = gfx.sy;
-    width = gfx.sxsize;
-    height = gfx.sysize;
-  }
-
-  BlitBitmap(drawto, window, x, y, width, height, x, y);
-}
-
-#endif
+  Bitmap *src_bitmap = getGlobalBorderBitmapFromStatus(global.border_status);
+  Bitmap *dst_bitmap = gfx.masked_border_bitmap_ptr;
 
-void DrawMaskedBorder_Rect(int x, int y, int width, int height)
-{
-  Bitmap *bitmap = graphic_info[IMG_GLOBAL_BORDER].bitmap;
+  if (x == -1 && y == -1)
+    return;
 
-  SetClipOrigin(bitmap, bitmap->stored_clip_gc, 0, 0);
-  BlitBitmapMasked(bitmap, backbuffer, x, y, width, height, x, y);
+  if (draw_target == DRAW_TO_SCREEN)
+    BlitToScreenMasked(src_bitmap, x, y, width, height, x, y);
+  else
+    BlitBitmapMasked(src_bitmap, dst_bitmap, x, y, width, height, x, y);
 }
 
-void DrawMaskedBorder_FIELD()
+static void DrawMaskedBorderExt_FIELD(int draw_target)
 {
-  if (global.border_status >= GAME_MODE_TITLE &&
+  if (global.border_status >= GAME_MODE_MAIN &&
       global.border_status <= GAME_MODE_PLAYING &&
       border.draw_masked[global.border_status])
-    DrawMaskedBorder_Rect(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+    DrawMaskedBorderExt_Rect(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
+                            draw_target);
 }
 
-void DrawMaskedBorder_DOOR_1()
+static void DrawMaskedBorderExt_DOOR_1(int draw_target)
 {
+  // when drawing to backbuffer, never draw border over open doors
+  if (draw_target == DRAW_TO_BACKBUFFER &&
+      (GetDoorState() & DOOR_OPEN_1))
+    return;
+
   if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] &&
       (global.border_status != GAME_MODE_EDITOR ||
        border.draw_masked[GFX_SPECIAL_ARG_EDITOR]))
-    DrawMaskedBorder_Rect(DX, DY, DXSIZE, DYSIZE);
+    DrawMaskedBorderExt_Rect(DX, DY, DXSIZE, DYSIZE, draw_target);
 }
 
-void DrawMaskedBorder_DOOR_2()
+static void DrawMaskedBorderExt_DOOR_2(int draw_target)
 {
+  // when drawing to backbuffer, never draw border over open doors
+  if (draw_target == DRAW_TO_BACKBUFFER &&
+      (GetDoorState() & DOOR_OPEN_2))
+    return;
+
   if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] &&
       global.border_status != GAME_MODE_EDITOR)
-    DrawMaskedBorder_Rect(VX, VY, VXSIZE, VYSIZE);
+    DrawMaskedBorderExt_Rect(VX, VY, VXSIZE, VYSIZE, draw_target);
 }
 
-void DrawMaskedBorder_DOOR_3()
+static void DrawMaskedBorderExt_DOOR_3(int draw_target)
 {
   /* currently not available */
 }
 
-void DrawMaskedBorder_ALL()
+static void DrawMaskedBorderExt_ALL(int draw_target)
 {
-  DrawMaskedBorder_FIELD();
-  DrawMaskedBorder_DOOR_1();
-  DrawMaskedBorder_DOOR_2();
-  DrawMaskedBorder_DOOR_3();
+  DrawMaskedBorderExt_FIELD(draw_target);
+  DrawMaskedBorderExt_DOOR_1(draw_target);
+  DrawMaskedBorderExt_DOOR_2(draw_target);
+  DrawMaskedBorderExt_DOOR_3(draw_target);
 }
 
-void DrawMaskedBorder(int redraw_mask)
+static void DrawMaskedBorderExt(int redraw_mask, int draw_target)
 {
   /* 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 (global.border_status == GAME_MODE_LOADING ||
+      global.border_status == GAME_MODE_TITLE)
     return;
 
   if (redraw_mask & REDRAW_ALL)
-    DrawMaskedBorder_ALL();
+    DrawMaskedBorderExt_ALL(draw_target);
   else
   {
     if (redraw_mask & REDRAW_FIELD)
-      DrawMaskedBorder_FIELD();
+      DrawMaskedBorderExt_FIELD(draw_target);
     if (redraw_mask & REDRAW_DOOR_1)
-      DrawMaskedBorder_DOOR_1();
+      DrawMaskedBorderExt_DOOR_1(draw_target);
     if (redraw_mask & REDRAW_DOOR_2)
-      DrawMaskedBorder_DOOR_2();
+      DrawMaskedBorderExt_DOOR_2(draw_target);
     if (redraw_mask & REDRAW_DOOR_3)
-      DrawMaskedBorder_DOOR_3();
+      DrawMaskedBorderExt_DOOR_3(draw_target);
   }
 }
 
-static void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
+void DrawMaskedBorder_FIELD()
 {
-  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
+  DrawMaskedBorderExt_FIELD(DRAW_TO_BACKBUFFER);
+}
 
-  ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
-  ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
+void DrawMaskedBorder(int redraw_mask)
+{
+  DrawMaskedBorderExt(redraw_mask, DRAW_TO_BACKBUFFER);
+}
 
-  if (EVEN(SCR_FIELDX))
+void DrawMaskedBorderToTarget(int draw_target)
+{
+  if (draw_target == DRAW_TO_BACKBUFFER ||
+      draw_target == DRAW_TO_SCREEN)
   {
-    if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
-      fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
-    else
-      fx += (dx_var > 0 ? TILEX_VAR : 0);
+    DrawMaskedBorderExt(REDRAW_ALL, draw_target);
   }
   else
   {
-    fx += dx_var;
-  }
+    int last_border_status = global.border_status;
 
-  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_var > 0 ? TILEY_VAR : 0);
-  }
-  else
-  {
-    fy += dy_var;
+    if (draw_target == DRAW_TO_FADE_SOURCE)
+    {
+      global.border_status = gfx.fade_border_source_status;
+      gfx.masked_border_bitmap_ptr = gfx.fade_bitmap_source;
+    }
+    else if (draw_target == DRAW_TO_FADE_TARGET)
+    {
+      global.border_status = gfx.fade_border_target_status;
+      gfx.masked_border_bitmap_ptr = gfx.fade_bitmap_target;
+    }
+
+    DrawMaskedBorderExt(REDRAW_ALL, draw_target);
+
+    global.border_status = last_border_status;
+    gfx.masked_border_bitmap_ptr = backbuffer;
   }
+}
 
-#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
+void BlitScreenToBitmap_RND(Bitmap *target_bitmap)
+{
+  int fx = getFieldbufferOffsetX_RND();
+  int fy = getFieldbufferOffsetY_RND();
 
-#if 1
-  if (full_lev_fieldx <= SCR_FIELDX)
-  {
-    // printf(":1: PLAYFIELD FITS TO SCREEN [%d, %d, %d]\n", fx, ffx, dx_var);
-
-    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);
-
-    // printf(":2: PLAYFIELD FITS TO SCREEN [%d, %d, %d]\n", fx, ffx, dx_var);
-  }
-
-  if (full_lev_fieldy <= SCR_FIELDY)
-  {
-    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);
-  }
-#endif
-
-  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, target_bitmap,
-              REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
-              REAL_SX, REAL_SY);
-  }
-  else
-  {
-    BlitBitmap(buffer, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
-  }
-}
+  BlitBitmap(drawto_field, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY);
+}
 
 void BlitScreenToBitmap(Bitmap *target_bitmap)
 {
@@ -600,400 +649,202 @@ void BlitScreenToBitmap(Bitmap *target_bitmap)
     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_MM)
+    BlitScreenToBitmap_MM(target_bitmap);
   else if (level.game_engine_type == GAME_ENGINE_TYPE_RND)
     BlitScreenToBitmap_RND(target_bitmap);
+
+  redraw_mask |= REDRAW_FIELD;
 }
 
-void BackToFront()
+void DrawFramesPerSecond()
 {
-  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 (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
-    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
-
-#if 0
-  /* !!! TEST ONLY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-  /* (force full redraw) */
-  if (game_status == GAME_MODE_PLAYING)
-    redraw_mask |= REDRAW_FIELD;
-#endif
+  char text[100];
+  int font_nr = FONT_TEXT_2;
+  int font_width = getFontWidth(font_nr);
+  int draw_deactivation_mask = GetDrawDeactivationMask();
+  boolean draw_masked = (draw_deactivation_mask == REDRAW_NONE);
 
-  if (redraw_mask & REDRAW_FIELD)
-    redraw_mask &= ~REDRAW_TILES;
+  /* draw FPS with leading space (needed if field buffer deactivated) */
+  sprintf(text, " %04.1f fps", global.frames_per_second);
 
-  if (redraw_mask == REDRAW_NONE)
-    return;
+  /* override draw deactivation mask (required for invisible warp mode) */
+  SetDrawDeactivationMask(REDRAW_NONE);
 
-#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
+  /* draw opaque FPS if field buffer deactivated, else draw masked FPS */
+  DrawTextExt(backbuffer, SX + SXSIZE - font_width * strlen(text), SY, text,
+             font_nr, (draw_masked ? BLIT_MASKED : BLIT_OPAQUE));
 
-  if (redraw_mask & REDRAW_TILES &&
-      game_status == GAME_MODE_PLAYING &&
-      border.draw_masked[GAME_MODE_PLAYING])
-    redraw_mask |= REDRAW_FIELD;
+  /* set draw deactivation mask to previous value */
+  SetDrawDeactivationMask(draw_deactivation_mask);
 
-  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;
+  /* force full-screen redraw in this frame */
+  redraw_mask = REDRAW_ALL;
+}
 
-    if (global.fps_slowdown_factor > 1 &&
-       (FrameCounter % global.fps_slowdown_factor) &&
-       (just_scrolling || skip_even_when_not_scrolling))
-    {
-      redraw_mask &= ~REDRAW_MAIN;
+#if DEBUG_FRAME_TIME
+static void PrintFrameTimeDebugging()
+{
+  static unsigned int last_counter = 0;
+  unsigned int counter = Counter();
+  int diff_1 = counter - last_counter;
+  int diff_2 = diff_1 - GAME_FRAME_DELAY;
+  int diff_2_max = 20;
+  int diff_2_cut = MIN(ABS(diff_2), diff_2_max);
+  char diff_bar[2 * diff_2_max + 5];
+  int pos = 0;
+  int i;
 
-      last_frame_skipped = TRUE;
+  diff_bar[pos++] = (diff_2 < -diff_2_max ? '<' : ' ');
 
-      if (verbose)
-       printf("FRAME SKIPPED\n");
-    }
-    else
-    {
-      if (last_frame_skipped)
-       redraw_mask |= REDRAW_FIELD;
+  for (i = 0; i < diff_2_max; i++)
+    diff_bar[pos++] = (diff_2 >= 0 ? ' ' :
+                      i >= diff_2_max - diff_2_cut ? '-' : ' ');
 
-      last_frame_skipped = FALSE;
+  diff_bar[pos++] = '|';
 
-      if (verbose)
-       printf("frame not skipped\n");
-    }
-  }
+  for (i = 0; i < diff_2_max; i++)
+    diff_bar[pos++] = (diff_2 <= 0 ? ' ' : i < diff_2_cut ? '+' : ' ');
 
-  /* 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 */
+  diff_bar[pos++] = (diff_2 > diff_2_max ? '>' : ' ');
 
-  SyncDisplay();
+  diff_bar[pos++] = '\0';
 
-  /* 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);
+  Error(ERR_INFO, "%06d [%02d] [%c%02d] %s",
+       counter,
+       diff_1,
+       (diff_2 < 0 ? '-' : diff_2 > 0 ? '+' : ' '), ABS(diff_2),
+       diff_bar);
 
-  if (redraw_mask & REDRAW_ALL)
-  {
-#if 0
-    if (game_status != GAME_MODE_PLAYING ||
-       redraw_mask & REDRAW_FROM_BACKBUFFER)
-    {
-#if 0
-      printf("::: REDRAW_ALL [%d]\n", FrameCounter);
+  last_counter = counter;
+}
 #endif
 
-      BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+static int unifiedRedrawMask(int mask)
+{
+  if (mask & REDRAW_ALL)
+    return REDRAW_ALL;
 
-      redraw_mask = REDRAW_NONE;
-    }
-    else
-    {
-      redraw_mask &= ~REDRAW_ALL;
-    }
-#else
-#if 0
-    printf("::: REDRAW_ALL [%d]\n", FrameCounter);
-#endif
+  if (mask & REDRAW_FIELD && mask & REDRAW_DOORS)
+    return REDRAW_ALL;
 
-    BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  return mask;
+}
 
-    redraw_mask = REDRAW_NONE;
-#endif
-  }
+static boolean equalRedrawMasks(int mask_1, int mask_2)
+{
+  return unifiedRedrawMask(mask_1) == unifiedRedrawMask(mask_2);
+}
 
-  if (redraw_mask & REDRAW_FIELD)
-  {
-#if 0
-    printf("::: REDRAW_FIELD [%d]\n", FrameCounter);
-#endif
+void BackToFront()
+{
+  static int last_redraw_mask = REDRAW_NONE;
 
-    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_RND(window);
-#else
-      int fx = FX, fy = FY;
+  // force screen redraw in every frame to continue drawing global animations
+  // (but always use the last redraw mask to prevent unwanted side effects)
+  if (redraw_mask == REDRAW_NONE)
+    redraw_mask = last_redraw_mask;
 
-#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;
+  last_redraw_mask = redraw_mask;
 
-      // fx += dx * TILESIZE_VAR / TILESIZE;
-      // fy += dy * TILESIZE_VAR / TILESIZE;
+#if 1
+  // masked border now drawn immediately when blitting backbuffer to window
 #else
-      fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
-      fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
+  // draw masked border to all viewports, if defined
+  DrawMaskedBorder(redraw_mask);
 #endif
 
-      /* !!! THIS WORKS !!! */
+  // draw frames per second (only if debug mode is enabled)
+  if (redraw_mask & REDRAW_FPS)
+    DrawFramesPerSecond();
 
-      printf("::: %d, %d\n", scroll_x, scroll_y);
+  // remove playfield redraw before potentially merging with doors redraw
+  if (DrawingDeactivated(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE))
+    redraw_mask &= ~REDRAW_FIELD;
 
-      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 complete window if both playfield and (some) doors need redraw
+  if (redraw_mask & REDRAW_FIELD && redraw_mask & REDRAW_DOORS)
+    redraw_mask = REDRAW_ALL;
 
-    redraw_mask &= ~REDRAW_MAIN;
-  }
+  /* 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_DOORS)
+  if (redraw_mask & REDRAW_ALL)
   {
-    if (redraw_mask & REDRAW_DOOR_1)
-      BlitBitmap(backbuffer, window, DX, DY, DXSIZE, DYSIZE, DX, DY);
-
-    if (redraw_mask & REDRAW_DOOR_2)
-      BlitBitmap(backbuffer, window, VX, VY, VXSIZE, VYSIZE, VX, VY);
-
-    if (redraw_mask & REDRAW_DOOR_3)
-      BlitBitmap(backbuffer, window, EX, EY, EXSIZE, EYSIZE, EX, EY);
-
-    redraw_mask &= ~REDRAW_DOORS;
+    BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
   }
-
-  if (redraw_mask & REDRAW_MICROLEVEL)
+  else if (redraw_mask & REDRAW_FIELD)
   {
-    BlitBitmap(backbuffer, window, SX, SY + 10 * TILEY, SXSIZE, 7 * TILEY,
-              SX, SY + 10 * TILEY);
-
-    redraw_mask &= ~REDRAW_MICROLEVEL;
+    BlitBitmap(backbuffer, window,
+              REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
   }
-
-  if (redraw_mask & REDRAW_TILES)
+  else if (redraw_mask & REDRAW_DOORS)
   {
-#if 0
-    printf("::: REDRAW_TILES\n");
-#endif
-
-#if NEW_TILESIZE
-
-#if 1
-    InitGfxClipRegion(TRUE, SX, SY, SXSIZE, SYSIZE);
+    // merge door areas to prevent calling screen redraw more than once
+    int x1 = WIN_XSIZE;
+    int y1 = WIN_YSIZE;
+    int x2 = 0;
+    int y2 = 0;
 
+    if (redraw_mask & REDRAW_DOOR_1)
     {
-      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);
-       }
-      }
+      x1 = MIN(x1, DX);
+      y1 = MIN(y1, DY);
+      x2 = MAX(x2, DX + DXSIZE);
+      y2 = MAX(y2, DY + DYSIZE);
+    }
 
-#if 0
-      printf("::: %d, %d, %d, %d\n", sx, sy, SCR_FIELDX, SCR_FIELDY);
-#endif
+    if (redraw_mask & REDRAW_DOOR_2)
+    {
+      x1 = MIN(x1, VX);
+      y1 = MIN(y1, VY);
+      x2 = MAX(x2, VX + VXSIZE);
+      y2 = MAX(y2, VY + VYSIZE);
+    }
 
-      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);
+    if (redraw_mask & REDRAW_DOOR_3)
+    {
+      x1 = MIN(x1, EX);
+      y1 = MIN(y1, EY);
+      x2 = MAX(x2, EX + EXSIZE);
+      y2 = MAX(y2, EY + EYSIZE);
     }
 
-    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
+    // make sure that at least one pixel is blitted, and inside the screen
+    // (else nothing is blitted, causing the animations not to be updated)
+    x1 = MIN(MAX(0, x1), WIN_XSIZE - 1);
+    y1 = MIN(MAX(0, y1), WIN_YSIZE - 1);
+    x2 = MIN(MAX(1, x2), WIN_XSIZE);
+    y2 = MIN(MAX(1, y2), WIN_YSIZE);
 
-#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
+    BlitBitmap(backbuffer, window, x1, y1, x2 - x1, y2 - y1, x1, y1);
   }
 
-  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';
+  redraw_mask = REDRAW_NONE;
 
-    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);
+#if DEBUG_FRAME_TIME
+  PrintFrameTimeDebugging();
 #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;
 }
 
-static void FadeCrossSaveBackbuffer()
+void BackToFront_WithFrameDelay(unsigned int frame_delay_value)
 {
-  BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+  unsigned int frame_delay_value_old = GetVideoFrameDelay();
+
+  SetVideoFrameDelay(frame_delay_value);
+
+  BackToFront();
+
+  SetVideoFrameDelay(frame_delay_value_old);
 }
 
+static int fade_type_skip = FADE_TYPE_NONE;
+
 static void FadeExt(int fade_mask, int fade_mode, int fade_type)
 {
-  static int fade_type_skip = FADE_TYPE_NONE;
   void (*draw_border_function)(void) = NULL;
-  Bitmap *bitmap = (fade_mode & FADE_TYPE_TRANSFORM ? bitmap_db_cross : NULL);
   int x, y, width, height;
   int fade_delay, post_delay;
 
@@ -1001,10 +852,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;
@@ -1013,94 +860,41 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type)
     }
 
     if (fading.fade_mode & FADE_TYPE_TRANSFORM)
-    {
-      FadeCrossSaveBackbuffer();
-
       return;
-    }
   }
 
   redraw_mask |= fade_mask;
 
   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 */
@@ -1113,79 +907,116 @@ 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
-
-#if 1
     BlitBitmap(backbuffer, window, x, y, width, height, x, y);
 
     redraw_mask &= ~fade_mask;
-#else
-    /* always redraw area that was explicitly marked to fade */
-    redraw_mask |= fade_mask;
 
-    BackToFront();
-#endif
+    return;
+  }
 
-#else
+  FadeRectangle(x, y, width, height, fade_mode, fade_delay, post_delay,
+               draw_border_function);
 
-#if 1
-    BlitBitmap(backbuffer, window, x, y, width, height, x, y);
-    redraw_mask = REDRAW_NONE;
-    // (^^^ WRONG; should be "redraw_mask &= ~fade_mask" if done this way)
-#else
-    BackToFront();
-#endif
-#endif
+  redraw_mask &= ~fade_mask;
+}
 
-    return;
-  }
+static void SetScreenStates_BeforeFadingIn()
+{
+  // temporarily set screen mode for animations to screen after fading in
+  global.anim_status = global.anim_status_next;
 
-  FadeRectangle(bitmap, x, y, width, height, fade_mode, fade_delay, post_delay,
-               draw_border_function);
+  // store backbuffer with all animations that will be started after fading in
+  if (fade_type_skip != FADE_MODE_SKIP_FADE_IN)
+    PrepareFadeBitmap(DRAW_TO_FADE_TARGET);
 
-  redraw_mask &= ~fade_mask;
+  // set screen mode for animations back to fading
+  global.anim_status = GAME_MODE_PSEUDO_FADING;
+}
+
+static void SetScreenStates_AfterFadingIn()
+{
+  // store new source screen (to use correct masked border for fading)
+  gfx.fade_border_source_status = global.border_status;
+
+  global.anim_status = global.anim_status_next;
+}
+
+static void SetScreenStates_BeforeFadingOut()
+{
+  // store new target screen (to use correct masked border for fading)
+  gfx.fade_border_target_status = game_status;
+
+  // set screen mode for animations to fading
+  global.anim_status = GAME_MODE_PSEUDO_FADING;
+
+  // store backbuffer with all animations that will be stopped for fading out
+  if (fade_type_skip != FADE_MODE_SKIP_FADE_OUT)
+    PrepareFadeBitmap(DRAW_TO_FADE_SOURCE);
+}
+
+static void SetScreenStates_AfterFadingOut()
+{
+  global.border_status = game_status;
 }
 
 void FadeIn(int fade_mask)
 {
+  SetScreenStates_BeforeFadingIn();
+
+#if 1
+  DrawMaskedBorder(REDRAW_ALL);
+#endif
+
   if (fading.fade_mode & FADE_TYPE_TRANSFORM)
     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;
+
+  if (game_status == GAME_MODE_PLAYING &&
+      strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS))
+    SetOverlayActive(TRUE);
+
+  SetScreenStates_AfterFadingIn();
+
+  // force update of global animation status in case of rapid screen changes
+  redraw_mask = REDRAW_ALL;
+  BackToFront();
 }
 
 void FadeOut(int fade_mask)
 {
+  // update screen if areas covered by "fade_mask" and "redraw_mask" differ
+  if (!equalRedrawMasks(fade_mask, redraw_mask))
+    BackToFront();
+
+  SetScreenStates_BeforeFadingOut();
+
+  SetOverlayActive(FALSE);
+
+#if 0
+  DrawMaskedBorder(REDRAW_ALL);
+#endif
+
   if (fading.fade_mode & FADE_TYPE_TRANSFORM)
     FadeExt(fade_mask, fading.fade_mode, FADE_TYPE_FADE_OUT);
   else
     FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT);
 
-  global.border_status = game_status;
+  SetScreenStates_AfterFadingOut();
 }
 
 static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set)
@@ -1202,10 +1033,6 @@ void FadeSetEnterMenu()
 {
   fading = menu.enter_menu;
 
-#if 0
-  printf("::: storing enter_menu\n");
-#endif
-
   FadeSetLeaveNext(fading, TRUE);      /* (keep same fade mode) */
 }
 
@@ -1213,10 +1040,6 @@ void FadeSetLeaveMenu()
 {
   fading = menu.leave_menu;
 
-#if 0
-  printf("::: storing leave_menu\n");
-#endif
-
   FadeSetLeaveNext(fading, TRUE);      /* (keep same fade mode) */
 }
 
@@ -1224,20 +1047,12 @@ 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 */
 }
 
 void FadeSetNextScreen()
 {
-  fading = menu.next_screen;
-
-#if 0
-  printf("::: storing next_screen\n");
-#endif
+  fading = menu.next_screen[game_status];
 
   // (do not overwrite fade mode set by FadeSetEnterScreen)
   // FadeSetLeaveNext(fading, TRUE);   /* (keep same fade mode) */
@@ -1245,10 +1060,6 @@ void FadeSetNextScreen()
 
 void FadeSetLeaveScreen()
 {
-#if 0
-  printf("::: recalling last stored value\n");
-#endif
-
   FadeSetLeaveNext(menu.leave_screen[game_status], FALSE);     /* recall */
 }
 
@@ -1279,6 +1090,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 *getGlobalBorderBitmapFromStatus(int status)
+{
+  int graphic =
+    (status == GAME_MODE_MAIN ||
+     status == GAME_MODE_PSEUDO_TYPENAME       ? IMG_GLOBAL_BORDER_MAIN :
+     status == GAME_MODE_SCORES                        ? IMG_GLOBAL_BORDER_SCORES :
+     status == GAME_MODE_EDITOR                        ? IMG_GLOBAL_BORDER_EDITOR :
+     status == GAME_MODE_PLAYING               ? IMG_GLOBAL_BORDER_PLAYING :
+     IMG_GLOBAL_BORDER);
+
+  return getGlobalBorderBitmap(graphic);
+}
+
 void SetWindowBackgroundImageIfDefined(int graphic)
 {
   if (graphic_info[graphic].bitmap)
@@ -1299,63 +1143,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))
@@ -1364,20 +1179,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)
@@ -1400,32 +1201,157 @@ 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 = getGlobalBorderBitmapFromStatus(game_status);
+
+  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 = getGlobalBorderBitmapFromStatus(game_status);
+
+  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
+  if (game_status_last != GAME_MODE_TITLE)
+    BlitBitmap(backbuffer, bitmap_db_store_1, 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_1, 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_1, 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_1, 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_TO_FIELDBUFFER);
   }
   else
-    SetDrawtoField(DRAW_BACKBUFFER);
+  {
+    SetDrawtoField(DRAW_TO_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()
@@ -1434,6 +1360,10 @@ void SetBorderElement()
 
   BorderElement = EL_EMPTY;
 
+  /* the MM game engine does not use a visible border element */
+  if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return;
+
   for (y = 0; y < lev_fieldy && BorderElement == EL_EMPTY; y++)
   {
     for (x = 0; x < lev_fieldx; x++)
@@ -1447,9 +1377,10 @@ void SetBorderElement()
   }
 }
 
-void FloodFillLevel(int from_x, int from_y, int fill_element,
-                   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
-                   int max_fieldx, int max_fieldy)
+void FloodFillLevelExt(int from_x, int from_y, int fill_element,
+                      int max_array_fieldx, int max_array_fieldy,
+                      short field[max_array_fieldx][max_array_fieldy],
+                      int max_fieldx, int max_fieldy)
 {
   int i,x,y;
   int old_element;
@@ -1474,18 +1405,28 @@ void FloodFillLevel(int from_x, int from_y, int fill_element,
     y = from_y + check[i][1];
 
     if (IN_FIELD(x, y, max_fieldx, max_fieldy) && field[x][y] == old_element)
-      FloodFillLevel(x, y, fill_element, field, max_fieldx, max_fieldy);
+      FloodFillLevelExt(x, y, fill_element, max_array_fieldx, max_array_fieldy,
+                       field, max_fieldx, max_fieldy);
   }
 
   safety--;
 }
 
+void FloodFillLevel(int from_x, int from_y, int fill_element,
+                   short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
+                   int max_fieldx, int max_fieldy)
+{
+  FloodFillLevelExt(from_x, from_y, fill_element,
+                   MAX_LEV_FIELDX, MAX_LEV_FIELDY, field,
+                   max_fieldx, max_fieldy);
+}
+
 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)
@@ -1498,86 +1439,70 @@ inline int getGraphicAnimationFrame(int graphic, int sync_frame)
                           sync_frame);
 }
 
-void getSizedGraphicSourceExt(int graphic, int frame, int tilesize_raw,
-                             Bitmap **bitmap, int *x, int *y,
-                             boolean get_backside)
+void getGraphicSourceBitmap(int graphic, int tilesize, Bitmap **bitmap)
 {
-  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 tilesize_capped = MIN(MAX(1, tilesize), TILESIZE);
+
+  if (tilesize == gfx.standard_tile_size)
+    *bitmap = g->bitmaps[IMG_BITMAP_STANDARD];
+  else if (tilesize == game.tile_size)
+    *bitmap = g->bitmaps[IMG_BITMAP_GAME];
+  else
+    *bitmap = g->bitmaps[IMG_BITMAP_1x1 - log_2(tilesize_capped)];
+}
+
+void getGraphicSourceXY(int graphic, int frame, 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 (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;
+    *x = pos % max_width;
+    *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_y = pos % max_height;
+    *x = src_x % g->width + pos / max_height * g->width;
+    *y = pos % max_height;
   }
   else                         /* frames are ordered diagonally */
   {
-    src_x = src_x + frame * offset_x;
-    src_y = src_y + frame * offset_y;
+    *x = src_x + frame * g->offset_x;
+    *y = src_y + frame * g->offset_y;
   }
-
-  *bitmap = src_bitmap;
-  *x = startx + src_x;
-  *y = starty + src_y;
 }
 
-void getFixedGraphicSourceExt(int graphic, int frame, Bitmap **bitmap,
-                             int *x, int *y, boolean get_backside)
+void getSizedGraphicSourceExt(int graphic, int frame, int tilesize,
+                             Bitmap **bitmap, int *x, int *y,
+                             boolean get_backside)
 {
-  getSizedGraphicSourceExt(graphic, frame, TILESIZE, bitmap, x, y,
-                          get_backside);
+  struct GraphicInfo *g = &graphic_info[graphic];
+
+  // if no in-game graphics defined, always use standard graphic size
+  if (g->bitmaps[IMG_BITMAP_GAME] == NULL)
+    tilesize = TILESIZE;
+
+  getGraphicSourceBitmap(graphic, tilesize, bitmap);
+  getGraphicSourceXY(graphic, frame, x, y, get_backside);
+
+  *x = *x * tilesize / g->tile_size;
+  *y = *y * tilesize / g->tile_size;
 }
 
-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,
@@ -1588,56 +1513,14 @@ 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;
-
-  if (g->offset_y == 0)                /* frames are ordered horizontally */
-  {
-    int max_width = g->anim_frames_per_line * g->width;
-    int pos = (src_y / g->height) * max_width + src_x + frame * g->offset_x;
-
-    *x = pos % max_width;
-    *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 * g->height;
-    int pos = (src_x / g->width) * max_height + src_y + frame * g->offset_y;
-
-    *x = src_x % g->width + pos / max_height * g->width;
-    *y = pos % max_height;
-  }
-  else                         /* frames are ordered diagonally */
-  {
-    *x = src_x + frame * g->offset_x;
-    *y = src_y + frame * g->offset_y;
-  }
+  getSizedGraphicSourceExt(graphic, frame, TILESIZE_VAR, bitmap, x, y,
+                          get_backside);
 }
 
 void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y)
@@ -1656,12 +1539,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);
 }
 
@@ -1688,11 +1568,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,
@@ -1716,13 +1593,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);
 }
 
@@ -1750,14 +1623,8 @@ 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,
@@ -1768,9 +1635,8 @@ void DrawFixedGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_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, TILEX, TILEY,
+                  dst_x, dst_y);
 }
 
 void DrawSizedGraphic(int x, int y, int graphic, int frame, int tilesize)
@@ -1780,6 +1646,14 @@ void DrawSizedGraphic(int x, int y, int graphic, int frame, int tilesize)
   MarkTileDirty(x / tilesize, y / tilesize);
 }
 
+void DrawSizedGraphicThruMask(int x, int y, int graphic, int frame,
+                             int tilesize)
+{
+  DrawSizedGraphicThruMaskExt(drawto, SX + x * tilesize, SY + y * tilesize,
+                             graphic, frame, tilesize);
+  MarkTileDirty(x / tilesize, y / tilesize);
+}
+
 void DrawSizedGraphicExt(DrawBuffer *d, int x, int y, int graphic, int frame,
                         int tilesize)
 {
@@ -1790,6 +1664,16 @@ void DrawSizedGraphicExt(DrawBuffer *d, int x, int y, int graphic, int frame,
   BlitBitmap(src_bitmap, d, src_x, src_y, tilesize, tilesize, x, y);
 }
 
+void DrawSizedGraphicThruMaskExt(DrawBuffer *d, int x, int y, int graphic,
+                                int frame, int tilesize)
+{
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+
+  getSizedGraphicSource(graphic, frame, tilesize, &src_bitmap, &src_x, &src_y);
+  BlitBitmapMasked(src_bitmap, d, src_x, src_y, tilesize, tilesize, x, y);
+}
+
 void DrawMiniGraphic(int x, int y, int graphic)
 {
   DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic);
@@ -1830,20 +1714,20 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy,
       width = -dx;
       dx = TILEX + dx;
     }
-    else if (x==BX1 && dx < 0) /* object leaves playfield to the left */
+    else if (x == BX1 && dx < 0) /* object leaves playfield to the left */
     {
       width += dx;
       cx = -dx;
       dx = 0;
     }
-    else if (x==BX2 && dx > 0) /* object leaves playfield to the right */
+    else if (x == BX2 && dx > 0) /* object leaves playfield to the right */
       width -= dx;
     else if (dx)               /* general horizontal movement */
       MarkTileDirty(x + SIGN(dx), y);
 
     if (y < BY1)               /* object enters playfield from the top */
     {
-      if (cut_mode==CUT_BELOW) /* object completely above top border */
+      if (cut_mode == CUT_BELOW) /* object completely above top border */
        return;
 
       y = BY1;
@@ -1857,7 +1741,7 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy,
       height = -dy;
       dy = TILEY + dy;
     }
-    else if (y==BY1 && dy < 0) /* object leaves playfield to the top */
+    else if (y == BY1 && dy < 0) /* object leaves playfield to the top */
     {
       height += dy;
       cy = -dy;
@@ -1888,14 +1772,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)
   {
@@ -1904,21 +1786,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);
@@ -1934,72 +1807,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);
@@ -2012,21 +1851,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);
@@ -2161,6 +1991,9 @@ static void DrawLevelFieldCrumbledInnerCorners(int x, int y, int dx, int dy,
   int width, height, cx, cy;
   int sx = SCREENX(x), sy = SCREENY(y);
   int crumbled_border_size = graphic_info[graphic].border_size;
+  int crumbled_tile_size = graphic_info[graphic].tile_size;
+  int crumbled_border_size_var =
+    crumbled_border_size * TILESIZE_VAR / crumbled_tile_size;
   int i;
 
   getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
@@ -2188,23 +2021,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;
+  width  = crumbled_border_size_var;
+  height = crumbled_border_size_var;
+  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,
@@ -2215,56 +2038,33 @@ 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_tile_size = graphic_info[graphic].tile_size;
+  int crumbled_border_size_var =
+    crumbled_border_size * TILESIZE_VAR / crumbled_tile_size;
+  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) ||
-      crumbled_border_size >= TILESIZE / 3)
+      crumbled_border_size_var >= TILESIZE_VAR / 3)
     return;
 
   /* 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);
@@ -2278,13 +2078,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)
       {
@@ -2301,80 +2101,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);
-      }
-    }
-  }
-  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);
-      }
+                width, height,
+                FX + sx * TILEX_VAR + cx,
+                FY + sy * TILEY_VAR + cy);
     }
   }
-#endif
 }
 
 static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
@@ -2395,12 +2127,12 @@ static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
 
   element = TILE_GFX_ELEMENT(x, y);
 
-  /* crumble field itself */
-  if (IS_CRUMBLED_TILE(x, y, element))
+  if (IS_CRUMBLED_TILE(x, y, element))         /* crumble field itself */
   {
     if (!IN_SCR_FIELD(sx, sy))
       return;
 
+    /* crumble field borders towards direct neighbour fields */
     for (i = 0; i < 4; i++)
     {
       int xx = x + xy[i][0];
@@ -2410,19 +2142,15 @@ 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);
     }
 
+    /* crumble inner field corners towards corner neighbour fields */
     if ((graphic_info[graphic].style & STYLE_INNER_CORNERS) &&
        graphic_info[graphic].anim_frames == 2)
     {
@@ -2437,8 +2165,9 @@ static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
 
     MarkTileDirty(sx, sy);
   }
-  else         /* center field not crumbled -- crumble neighbour fields */
+  else         /* center field is not crumbled -- crumble neighbour fields */
   {
+    /* crumble field borders of direct neighbour fields */
     for (i = 0; i < 4; i++)
     {
       int xx = x + xy[i][0];
@@ -2464,6 +2193,37 @@ static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame)
 
       MarkTileDirty(sxx, syy);
     }
+
+    /* crumble inner field corners of corner neighbour fields */
+    for (i = 0; i < 4; i++)
+    {
+      int dx = (i & 1 ? +1 : -1);
+      int dy = (i & 2 ? +1 : -1);
+      int xx = x + dx;
+      int yy = y + dy;
+      int sxx = sx + dx;
+      int syy = sy + dy;
+
+      if (!IN_LEV_FIELD(xx, yy) ||
+         !IN_SCR_FIELD(sxx, syy))
+       continue;
+
+      if (Feld[xx][yy] == EL_ELEMENT_SNAPPING)
+       continue;
+
+      element = TILE_GFX_ELEMENT(xx, yy);
+
+      if (!IS_CRUMBLED_TILE(xx, yy, element))
+       continue;
+
+      graphic = el_act2crm(element, ACTION_DEFAULT);
+
+      if ((graphic_info[graphic].style & STYLE_INNER_CORNERS) &&
+         graphic_info[graphic].anim_frames == 2)
+       DrawLevelFieldCrumbledInnerCorners(xx, yy, -dx, -dy, graphic);
+
+      MarkTileDirty(sxx, syy);
+    }
   }
 }
 
@@ -2474,14 +2234,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]))
@@ -2490,13 +2242,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);
 }
@@ -2526,6 +2273,7 @@ void DrawLevelFieldCrumbledNeighbours(int x, int y)
   };
   int i;
 
+  /* crumble direct neighbour fields (required for field borders) */
   for (i = 0; i < 4; i++)
   {
     int xx = x + xy[i][0];
@@ -2541,6 +2289,30 @@ void DrawLevelFieldCrumbledNeighbours(int x, int y)
 
     DrawLevelField(xx, yy);
   }
+
+  /* crumble corner neighbour fields (required for inner field corners) */
+  for (i = 0; i < 4; i++)
+  {
+    int dx = (i & 1 ? +1 : -1);
+    int dy = (i & 2 ? +1 : -1);
+    int xx = x + dx;
+    int yy = y + dy;
+    int sxx = sx + dx;
+    int syy = sy + dy;
+
+    if (!IN_LEV_FIELD(xx, yy) ||
+       !IN_SCR_FIELD(sxx, syy) ||
+       !GFX_CRUMBLED(Feld[xx][yy]) ||
+       IS_MOVING(xx, yy))
+      continue;
+
+    int element = TILE_GFX_ELEMENT(xx, yy);
+    int graphic = el_act2crm(element, ACTION_DEFAULT);
+
+    if ((graphic_info[graphic].style & STYLE_INNER_CORNERS) &&
+       graphic_info[graphic].anim_frames == 2)
+      DrawLevelField(xx, yy);
+  }
 }
 
 static int getBorderElement(int x, int y)
@@ -2617,22 +2389,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);
 
@@ -2644,11 +2402,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)
@@ -2658,6 +2414,10 @@ void DrawScreenField(int x, int y)
       int newly = ly + (dir == MV_UP   ? -1 : dir == MV_DOWN  ? +1 : 0);
 
       DrawLevelElementThruMask(newlx, newly, EL_ACID);
+
+      // prevent target field from being drawn again (but without masking)
+      // (this would happen if target field is scanned after moving element)
+      Stop[newlx][newly] = TRUE;
     }
   }
   else if (IS_BLOCKED(lx, ly))
@@ -2725,6 +2485,92 @@ void DrawLevelField(int x, int y)
   }
 }
 
+static void DrawSizedWallExt_MM(int dst_x, int dst_y, int element, int tilesize,
+                               int (*el2img_function)(int), boolean masked,
+                               int element_bits_draw)
+{
+  int element_base = map_mm_wall_element(element);
+  int element_bits = (IS_DF_WALL(element) ?
+                     element - EL_DF_WALL_START :
+                     IS_MM_WALL(element) ?
+                     element - EL_MM_WALL_START : EL_EMPTY) & 0x000f;
+  int graphic = el2img_function(element_base);
+  int tilesize_draw = tilesize / 2;
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int i;
+
+  getSizedGraphicSource(graphic, 0, tilesize_draw, &src_bitmap, &src_x, &src_y);
+
+  for (i = 0; i < 4; i++)
+  {
+    int dst_draw_x = dst_x + (i % 2) * tilesize_draw;
+    int dst_draw_y = dst_y + (i / 2) * tilesize_draw;
+
+    if (!(element_bits_draw & (1 << i)))
+      continue;
+
+    if (element_bits & (1 << i))
+    {
+      if (masked)
+       BlitBitmapMasked(src_bitmap, drawto, src_x, src_y,
+                        tilesize_draw, tilesize_draw, dst_draw_x, dst_draw_y);
+      else
+       BlitBitmap(src_bitmap, drawto, src_x, src_y,
+                  tilesize_draw, tilesize_draw, dst_draw_x, dst_draw_y);
+    }
+    else
+    {
+      if (!masked)
+       ClearRectangle(drawto, dst_draw_x, dst_draw_y,
+                      tilesize_draw, tilesize_draw);
+    }
+  }
+}
+
+void DrawSizedWallParts_MM(int x, int y, int element, int tilesize,
+                          boolean masked, int element_bits_draw)
+{
+  DrawSizedWallExt_MM(SX + x * tilesize, SY + y * tilesize,
+                     element, tilesize, el2edimg, masked, element_bits_draw);
+}
+
+void DrawSizedWall_MM(int dst_x, int dst_y, int element, int tilesize,
+                     int (*el2img_function)(int))
+{
+  DrawSizedWallExt_MM(dst_x, dst_y, element, tilesize, el2img_function, FALSE,
+                     0x000f);
+}
+
+void DrawSizedElementExt(int x, int y, int element, int tilesize,
+                        boolean masked)
+{
+  if (IS_MM_WALL(element))
+  {
+    DrawSizedWallExt_MM(SX + x * tilesize, SY + y * tilesize,
+                       element, tilesize, el2edimg, masked, 0x000f);
+  }
+  else
+  {
+    int graphic = el2edimg(element);
+
+    if (masked)
+      DrawSizedGraphicThruMask(x, y, graphic, 0, tilesize);
+    else
+      DrawSizedGraphic(x, y, graphic, 0, tilesize);
+  }
+}
+
+void DrawSizedElement(int x, int y, int element, int tilesize)
+{
+  DrawSizedElementExt(x, y, element, tilesize, FALSE);
+}
+
+void DrawSizedElementThruMask(int x, int y, int element, int tilesize)
+{
+  DrawSizedElementExt(x, y, element, tilesize, TRUE);
+}
+
 void DrawMiniElement(int x, int y, int element)
 {
   int graphic;
@@ -2733,6 +2579,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;
@@ -2777,12 +2636,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);
@@ -2807,7 +2662,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 = MAX(1, (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);
@@ -2819,46 +2674,41 @@ 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_TO_FIELDBUFFER);
 
-#if 1
     BlitScreenToBitmap(backbuffer);
-#else
-    BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
-#endif
 
-    SetDrawtoField(DRAW_BACKBUFFER);
+    SetDrawtoField(DRAW_TO_BACKBUFFER);
 
     for (yy = 0; yy < ysize; yy++)
       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);
   }
 }
 
@@ -2900,19 +2750,63 @@ void ShowEnvelope(int envelope_nr)
 
   game.envelope_active = FALSE;
 
-  SetDrawtoField(DRAW_BUFFERED);
+  SetDrawtoField(DRAW_TO_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)
   {
@@ -2924,6 +2818,11 @@ 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)
 {
   char *text_final = text;
@@ -2937,19 +2836,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;
 
@@ -2986,62 +2891,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 */
+  SetFontStatus(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);
 
+  ResetFontStatus();
+
   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
+  BlitBitmap(backbuffer, bitmap_db_store_2, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
   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 = MAX(1, (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;
 
@@ -3051,27 +2934,39 @@ 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;
+  }
 
-  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;
 
-    BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+    setRequestPosition(&src_x, &src_y, FALSE);
+    setRequestPositionExt(&dst_x, &dst_y, width, height, FALSE);
+
+    BlitBitmap(bitmap_db_store_1, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
-#if 1
     for (yy = 0; yy < 2; yy++)
     {
       for (xx = 0; xx < 2; xx++)
@@ -3084,357 +2979,64 @@ void AnimateEnvelopeRequest(int anim_mode, int action)
        int yy_size = (yy ? tile_size : ysize_size_top);
 
        if (draw_masked)
-         BlitBitmapMasked(bitmap_db_cross, backbuffer,
+         BlitBitmapMasked(bitmap_db_store_2, backbuffer,
                           src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy);
        else
-         BlitBitmap(bitmap_db_cross, backbuffer,
+         BlitBitmap(bitmap_db_store_2, backbuffer,
                     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 0
-    redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER;
-    // redraw_mask |= REDRAW_ALL | REDRAW_FROM_BACKBUFFER;
-#else
-  /* CHECK AGAIN (previous code reactivated) */
-    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
-
-#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
-
-#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;
-
-#if 1
-  char *text_ptr;
-  char *text_copy = getStringCopy(text);
-#else
-#if 1
-  font_nr = FONT_TEXT_2;
-
-  if (maxWordLengthInString(text) > 7) /* MAX_REQUEST_LINE_FONT1_LEN == 7 */
-  {
-    max_xsize = 10;    /* tools.c: MAX_REQUEST_LINE_FONT2_LEN == 10 */
-    font_nr = FONT_TEXT_1;
-  }
-#else
-  int max_word_len = 0;
-  char *text_ptr;
-  char *text_copy = getStringCopy(text);
-
-  font_nr = FONT_TEXT_2;
-
-  for (text_ptr = text; *text_ptr; text_ptr++)
-  {
-    max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0);
-
-    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;
-
-      break;
-    }
-  }
-#endif
-#endif
-
-#if 1
-  for (text_ptr = text_copy; *text_ptr; text_ptr++)
-    if (*text_ptr == ' ')
-      *text_ptr = '\n';
-#endif
-
-#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
-
-  for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += 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 = SX + (SYSIZE - ysize * font_height) / 2;
-    int sy = SY + (SYSIZE - ysize * (font_height + line_spacing)) / 2;
-    int xx, yy;
-
-#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
-
-    SetDrawtoField(DRAW_BACKBUFFER);
-#endif
-
-    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 1
-
-#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
-
-#else
-    DrawTextToTextArea(sx + font_width, sy + font_height,
-                      level.envelope[envelope_nr].text, font_nr, max_xsize,
-                      xsize - 2, ysize - 2, mask_mode);
-#endif
-
-    /* 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
-
-#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
-
-#if 1
-    DoAnimation();
-    BackToFront();
-#else
-    BackToFront();
-#endif
-
-    WaitUntilDelayReached(&anim_delay, anim_delay_value / 2);
-  }
-
-#if 1
-  free(text_copy);
-#endif
-}
-
-#endif
-
-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 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 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 1
-#if 1
     BlitScreenToBitmap(backbuffer);
-#else
-    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
-      BlitScreenToBitmap_RND(backbuffer);
-#endif
-#else
-    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);
-    }
-#endif
-  }
 
-  SetDrawtoField(DRAW_BACKBUFFER);
+  SetDrawtoField(DRAW_TO_BACKBUFFER);
 
   // SetDrawBackgroundMask(REDRAW_NONE);
 
   if (action == ACTION_OPENING)
   {
-    BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
+    BlitBitmap(backbuffer, bitmap_db_store_1, 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 (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 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)
@@ -3445,13 +3047,6 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
       AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING);
 
     AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING);
-
-#if 0
-    if (tape.playing)
-      Delay(wait_delay_value);
-    else
-      WaitForEventToContinue();
-#endif
   }
   else
   {
@@ -3466,91 +3061,45 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action)
 
   game.envelope_active = FALSE;
 
-#if 1
-  // game_status = last_game_status;   /* restore current game status */
-
-#if 1
-  /* !!! CHECK AGAIN (SEE BELOW) !!! */
-  game_status = last_game_status;      /* restore current game status */
-#endif
-
   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
+    BlitBitmap(bitmap_db_store_1, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
   // SetDrawBackgroundMask(last_draw_background_mask);
 
-#if 0
-  redraw_mask = REDRAW_FIELD;
-  // redraw_mask |= REDRAW_ALL;
-#else
-  /* CHECK AGAIN (previous code reactivated) */
   redraw_mask |= REDRAW_FIELD;
-#endif
-
-#if 1
-  if (game_status == GAME_MODE_MAIN)
-    DoAnimation();
 
   BackToFront();
 
-#if 0
-  /* (important: after "BackToFront()", but before "SetDrawtoField()") */
-  game_status = last_game_status;      /* restore current game status */
-#endif
-
-#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
+    SetDrawtoField(DRAW_TO_FIELDBUFFER);
 }
 
 void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
 {
-  Bitmap *src_bitmap;
-  int src_x, src_y;
-  int graphic = el2preimg(element);
+  if (IS_MM_WALL(element))
+  {
+    DrawSizedWall_MM(dst_x, dst_y, element, tilesize, el2preimg);
+  }
+  else
+  {
+    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);
+    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(int draw_background_mask)
 {
   int x,y;
 
-#if 1
   SetMainBackgroundImage(IMG_BACKGROUND_PLAYING);
   SetDrawBackgroundMask(draw_background_mask);
-#else
-#if 1
-  SetMainBackgroundImage(IMG_BACKGROUND_PLAYING);
-  SetDrawBackgroundMask(REDRAW_FIELD);
-#else
-  SetDrawBackgroundMask(REDRAW_NONE);
-#endif
-#endif
 
   ClearField();
 
@@ -3561,6 +3110,18 @@ void DrawLevel(int draw_background_mask)
   redraw_mask |= REDRAW_FIELD;
 }
 
+void DrawSizedLevel(int size_x, int size_y, int scroll_x, int scroll_y,
+                   int tilesize)
+{
+  int 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;
+}
+
 void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
 {
   int x,y;
@@ -3572,7 +3133,7 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
   redraw_mask |= REDRAW_FIELD;
 }
 
-static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y)
+static void DrawPreviewLevelPlayfield(int from_x, int from_y)
 {
   boolean show_level_border = (BorderElement != EL_EMPTY);
   int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
@@ -3588,22 +3149,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++)
   {
@@ -3619,7 +3171,7 @@ static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y)
     }
   }
 
-  redraw_mask |= REDRAW_MICROLEVEL;
+  redraw_mask |= REDRAW_FIELD;
 }
 
 #define MICROLABEL_EMPTY               0
@@ -3646,12 +3198,10 @@ static int getMaxTextLength(struct TextPosInfo *pos, int font_nr)
   return max_text_width / font_width;
 }
 
-static void DrawPreviewLevelLabelExt(int mode)
+static void DrawPreviewLevelLabelExt(int mode, struct TextPosInfo *pos)
 {
-  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;
 
@@ -3662,42 +3212,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 :
@@ -3711,18 +3237,22 @@ 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_FIELD;
+}
+
+static void DrawPreviewLevelLabel(int mode)
+{
+  DrawPreviewLevelLabelExt(mode, &menu.main.text.level_info_2);
+}
 
-  redraw_mask |= REDRAW_MICROLEVEL;
+static void DrawPreviewLevelInfo(int mode)
+{
+  if (mode == MICROLABEL_LEVEL_NAME)
+    DrawPreviewLevelLabelExt(mode, &menu.main.text.level_name);
+  else if (mode == MICROLABEL_LEVEL_AUTHOR)
+    DrawPreviewLevelLabelExt(mode, &menu.main.text.level_author);
 }
 
 static void DrawPreviewLevelExt(boolean restart)
@@ -3735,12 +3265,6 @@ static void DrawPreviewLevelExt(boolean restart)
   boolean show_level_border = (BorderElement != EL_EMPTY);
   int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
   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)
   {
@@ -3762,8 +3286,11 @@ static void DrawPreviewLevelExt(boolean restart)
     label_state = 1;
     label_counter = 0;
 
-    DrawPreviewLevelPlayfieldExt(from_x, from_y);
-    DrawPreviewLevelLabelExt(label_state);
+    DrawPreviewLevelPlayfield(from_x, from_y);
+    DrawPreviewLevelLabel(label_state);
+
+    DrawPreviewLevelInfo(MICROLABEL_LEVEL_NAME);
+    DrawPreviewLevelInfo(MICROLABEL_LEVEL_AUTHOR);
 
     /* initialize delay counters */
     DelayReached(&scroll_delay, 0);
@@ -3773,42 +3300,19 @@ 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 */
-
     return;
   }
 
@@ -3865,7 +3369,7 @@ static void DrawPreviewLevelExt(boolean restart)
        break;
     }
 
-    DrawPreviewLevelPlayfieldExt(from_x, from_y);
+    DrawPreviewLevelPlayfield(from_x, from_y);
   }
 
   /* !!! THIS ALL SUCKS -- SHOULD BE CLEANLY REWRITTEN !!! */
@@ -3906,10 +3410,8 @@ static void DrawPreviewLevelExt(boolean restart)
       label_state = (label_state == MICROLABEL_IMPORTED_FROM_HEAD ?
                     MICROLABEL_IMPORTED_BY_HEAD : MICROLABEL_IMPORTED_BY);
 
-    DrawPreviewLevelLabelExt(label_state);
+    DrawPreviewLevelLabel(label_state);
   }
-
-  game_status = last_game_status;      /* restore current game status */
 }
 
 void DrawPreviewLevelInitial()
@@ -3922,8 +3424,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);
 
@@ -3933,9 +3436,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);
 
@@ -3945,24 +3447,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);
 
@@ -3986,7 +3484,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);
 
@@ -4207,15 +3705,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);
     }
@@ -4243,9 +3736,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
@@ -4275,13 +3765,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);
@@ -4301,15 +3784,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 */
@@ -4326,20 +3804,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 */
@@ -4354,7 +3818,6 @@ void DrawPlayer(struct PlayerInfo *player)
     DrawGraphicShiftedThruMask(px, py, pxx, pyy, graphic, frame, NO_CUTTING);
 #endif
   }
-#endif
 
 #if DRAW_PLAYER_OVER_PUSHED_ELEMENT
   /* ----------------------------------------------------------------------- */
@@ -4378,9 +3841,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
@@ -4456,28 +3916,31 @@ void WaitForEventToContinue()
 {
   boolean still_wait = TRUE;
 
+  if (program.headless)
+    return;
+
   /* simulate releasing mouse button over last gadget, if still pressed */
   if (button_status)
     HandleGadgets(-1, -1, 0);
 
   button_status = MB_RELEASED;
 
-#if 1
   ClearEventQueue();
-#endif
 
   while (still_wait)
   {
-    if (PendingEvent())
-    {
-      Event event;
-
-      NextEvent(&event);
+    Event event;
 
+    if (NextValidEvent(&event))
+    {
       switch (event.type)
       {
        case EVENT_BUTTONPRESS:
        case EVENT_KEYPRESS:
+#if defined(TARGET_SDL2)
+        case SDL_CONTROLLERBUTTONDOWN:
+#endif
+        case SDL_JOYBUTTONDOWN:
          still_wait = FALSE;
          break;
 
@@ -4495,10 +3958,7 @@ void WaitForEventToContinue()
       still_wait = FALSE;
     }
 
-    DoAnimation();
-
-    /* don't eat all CPU time */
-    Delay(10);
+    BackToFront();
   }
 }
 
@@ -4506,13 +3966,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;
 
@@ -4521,110 +3984,185 @@ static int RequestHandleEvents(unsigned int req_state)
 
   while (result < 0)
   {
+    if (level_solved)
+    {
+      /* the MM game engine does not use a special (scrollable) field buffer */
+      if (level.game_engine_type != GAME_ENGINE_TYPE_MM)
+       SetDrawtoField(DRAW_TO_FIELDBUFFER);
+
+      HandleGameActions();
+
+      SetDrawtoField(DRAW_TO_BACKBUFFER);
+
+      if (global.use_envelope_request)
+      {
+       /* copy current state of request area to middle of playfield area */
+       BlitBitmap(bitmap_db_store_2, 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;
+           {
+             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;
          }
 
-         /* this sets 'request_gadget_id' */
-         HandleGadgets(mx, my, button_status);
+#if defined(TARGET_SDL2)
+         case SDL_WINDOWEVENT:
+           HandleWindowEvent((WindowEvent *) &event);
+           break;
+
+         case SDL_APP_WILLENTERBACKGROUND:
+         case SDL_APP_DIDENTERBACKGROUND:
+         case SDL_APP_WILLENTERFOREGROUND:
+         case SDL_APP_DIDENTERFOREGROUND:
+           HandlePauseResumeEvent((PauseResumeEvent *) &event);
+           break;
+#endif
 
-         switch (request_gadget_id)
+         case EVENT_KEYPRESS:
          {
-           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;
-         }
+           Key key = GetEventKey((KeyEvent *)&event, TRUE);
 
-         break;
-       }
+           switch (key)
+           {
+             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_Select:
+             case KSYM_Menu:
+#if defined(KSYM_Rewind)
+             case KSYM_Rewind:         /* for Amazon Fire TV remote */
+#endif
+#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:
+#if defined(KSYM_FastForward)
+             case KSYM_FastForward:    /* for Amazon Fire TV remote */
 #endif
+#endif
+               result = 0;
+               break;
+
+             default:
+               HandleKeysDebug(key);
+               break;
+           }
+
+           if (req_state & REQ_PLAYER)
              result = 0;
-             break;
 
-           default:
-             break;
+           break;
          }
 
-         if (req_state & REQ_PLAYER)
-           result = 0;
-         break;
+         case EVENT_KEYRELEASE:
+           ClearPlayerAction();
+           break;
 
-       case EVENT_KEYRELEASE:
-         ClearPlayerAction();
-         break;
+#if defined(TARGET_SDL2)
+         case SDL_CONTROLLERBUTTONDOWN:
+           switch (event.cbutton.button)
+           {
+             case SDL_CONTROLLER_BUTTON_A:
+             case SDL_CONTROLLER_BUTTON_X:
+             case SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
+               result = 1;
+               break;
 
-       default:
-         HandleOtherEvents(&event);
-         break;
+             case SDL_CONTROLLER_BUTTON_B:
+             case SDL_CONTROLLER_BUTTON_Y:
+             case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
+             case SDL_CONTROLLER_BUTTON_BACK:
+               result = 0;
+               break;
+           }
+
+           if (req_state & REQ_PLAYER)
+             result = 0;
+
+           break;
+
+         case SDL_CONTROLLERBUTTONUP:
+           HandleJoystickEvent(&event);
+           ClearPlayerAction();
+           break;
+#endif
+
+         default:
+           HandleOtherEvents(&event);
+           break;
+       }
       }
     }
     else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED)
@@ -4637,43 +4175,16 @@ static int RequestHandleEvents(unsigned int req_state)
        result = 0;
     }
 
-#if 1
-
-    if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd)
-    {
-      HandleGameActions();
-    }
-    else
+    if (level_solved)
     {
-      DoAnimation();
-
-      if (!PendingEvent())     /* delay only if no pending events */
-       Delay(10);
+      if (global.use_envelope_request)
+      {
+       /* copy back current state of pressed buttons inside request area */
+       BlitBitmap(drawto, bitmap_db_store_2, sx, sy, width, height, sx, sy);
+      }
     }
 
-#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;
@@ -4682,7 +4193,6 @@ static int RequestHandleEvents(unsigned int req_state)
 static boolean RequestDoor(char *text, unsigned int req_state)
 {
   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;
   char *text_ptr;
@@ -4696,16 +4206,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   }
 
   if (game_status == GAME_MODE_PLAYING)
-  {
-#if 1
     BlitScreenToBitmap(backbuffer);
-#else
-    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);
-#endif
-  }
 
   /* disable deactivated drawing when quick-loading level tape recording */
   if (tape.playing && tape.deactivate_display)
@@ -4737,14 +4238,8 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     CloseDoor(DOOR_CLOSE_1);
 
     /* save old door content */
-#if 1
     BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
               0 * DXSIZE, 0, DXSIZE, DYSIZE, 1 * DXSIZE, 0);
-#else
-    BlitBitmap(bitmap_db_door, bitmap_db_door,
-              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
-              DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
-#endif
   }
 
   SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
@@ -4754,7 +4249,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   DrawBackground(DX, DY, DXSIZE, DYSIZE);
 
   /* force DOOR font inside door area */
-  game_status = GAME_MODE_PSEUDO_DOOR;
+  SetFontStatus(GAME_MODE_PSEUDO_DOOR);
 
   /* write text for request */
   for (text_ptr = text, ty = 0; ty < MAX_REQUEST_LINES; ty++)
@@ -4794,7 +4289,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     // text_ptr += tl + (tc == ' ' || tc == '?' || tc == '!' ? 1 : 0);
   }
 
-  game_status = last_game_status;      /* restore current game status */
+  ResetFontStatus();
 
   if (req_state & REQ_ASK)
   {
@@ -4814,13 +4309,7 @@ static boolean RequestDoor(char *text, unsigned int req_state)
   }
 
   /* copy request gadgets to door backbuffer */
-#if 1
   BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0);
-#else
-  BlitBitmap(drawto, bitmap_db_door,
-            DX, DY, DXSIZE, DYSIZE,
-            DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-#endif
 
   OpenDoor(DOOR_OPEN_1);
 
@@ -4839,17 +4328,11 @@ static boolean RequestDoor(char *text, unsigned int req_state)
     return FALSE;
   }
 
-  if (game_status != GAME_MODE_MAIN)
-    InitAnimation();
-
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
   // ---------- handle request buttons ----------
   result = RequestHandleEvents(req_state);
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
-
   UnmapToolButtons();
 
   if (!(req_state & REQ_STAY_OPEN))
@@ -4891,30 +4374,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 1
-#if 1
     BlitScreenToBitmap(backbuffer);
-#else
-    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
-      BlitScreenToBitmap_RND(backbuffer);
-#endif
-#else
-    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);
-#endif
-  }
 
   /* disable deactivated drawing when quick-loading level tape recording */
   if (tape.playing && tape.deactivate_display)
@@ -4943,74 +4405,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)
@@ -5026,19 +4422,11 @@ 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 ----------
   result = RequestHandleEvents(req_state);
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
-
   UnmapToolButtons();
 
   ShowEnvelopeRequest(text, req_state, ACTION_CLOSING);
@@ -5072,2228 +4460,902 @@ static boolean RequestEnvelope(char *text, unsigned int req_state)
 
 boolean Request(char *text, unsigned int req_state)
 {
+  boolean overlay_active = GetOverlayActive();
+  boolean result;
+
+  SetOverlayActive(FALSE);
+
   if (global.use_envelope_request)
-    return RequestEnvelope(text, req_state);
+    result = RequestEnvelope(text, req_state);
   else
-    return RequestDoor(text, req_state);
-}
+    result = RequestDoor(text, req_state);
 
-#else  // =====================================================================
+  SetOverlayActive(overlay_active);
 
-boolean Request(char *text, unsigned int req_state)
+  return result;
+}
+
+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_GFX_DOOR_1_PART_1,  IMG_GFX_DOOR_1_PART_8,  &door_1 },
+    { DOOR_2,  IMG_GFX_DOOR_2_PART_1,  IMG_GFX_DOOR_2_PART_8,  &door_2 },
 
-  if (game_status == GAME_MODE_PLAYING)
+    { -1,      -1,                     -1,                     NULL    }
+  };
+  struct Rect door_rect_list[] =
   {
-#if 1
-    BlitScreenToBitmap(backbuffer);
-#else
-    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);
-#endif
-  }
+    { 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)
+    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)
     {
-      SetPanelBackground();
-      SetDrawBackgroundMask(REDRAW_DOOR_1);
-    }
-    else
-    {
-      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
+  /* sort door part controls according to sort_priority and graphic number */
+  qsort(door_part_order, MAX_DOOR_PARTS,
+        sizeof(struct DoorPartOrderInfo), compareDoorPartOrderInfo);
+}
 
-  button_status = MB_RELEASED;
+unsigned int OpenDoor(unsigned int door_state)
+{
+  if (door_state & DOOR_COPY_BACK)
+  {
+    if (door_state & DOOR_OPEN_1)
+      BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
+                1 * DXSIZE, 0, DXSIZE, DYSIZE, 0 * DXSIZE, 0);
 
-  request_gadget_id = -1;
+    if (door_state & DOOR_OPEN_2)
+      BlitBitmap(bitmap_db_door_2, bitmap_db_door_2,
+                1 * VXSIZE, 0, VXSIZE, VYSIZE, 0 * VXSIZE, 0);
 
-  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+    door_state &= ~DOOR_COPY_BACK;
+  }
 
-  while (result < 0)
-  {
-    if (PendingEvent())
-    {
-      Event event;
+  return MoveDoor(door_state);
+}
 
-      NextEvent(&event);
+unsigned int CloseDoor(unsigned int door_state)
+{
+  unsigned int old_door_state = GetDoorState();
 
-      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 */
+  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);
 
-           if (!button_status)
-             continue;
+    if (old_door_state & DOOR_OPEN_2)
+      BlitBitmap(backbuffer, bitmap_db_door_2,
+                VX, VY, VXSIZE, VYSIZE, 0, 0);
 
-           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;
-         }
+    door_state &= ~DOOR_NO_COPY_BACK;
+  }
 
-         /* this sets 'request_gadget_id' */
-         HandleGadgets(mx, my, button_status);
+  return MoveDoor(door_state);
+}
 
-         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;
-         }
+unsigned int GetDoorState()
+{
+  return MoveDoor(DOOR_GET_STATE);
+}
 
-         break;
-       }
+unsigned int SetDoorState(unsigned int door_state)
+{
+  return MoveDoor(door_state | DOOR_SET_STATE);
+}
 
-       case EVENT_KEYPRESS:
-         switch (GetEventKey((KeyEvent *)&event, TRUE))
-         {
-           case KSYM_space:
-             if (req_state & REQ_CONFIRM)
-               result = 1;
-             break;
+int euclid(int a, int b)
+{
+  return (b ? euclid(b, a % b) : a);
+}
 
-           case KSYM_Return:
-             result = 1;
-             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_CLOSE_1;
+  static int door2 = DOOR_CLOSE_2;
+  unsigned int door_delay = 0;
+  unsigned int door_delay_value;
+  int i;
 
-           case KSYM_Escape:
-#if defined(TARGET_SDL2)
-           case KSYM_Back:
-#endif
-             result = 0;
-             break;
+  if (door_state == DOOR_GET_STATE)
+    return (door1 | door2);
 
-           default:
-             break;
-         }
+  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 (req_state & REQ_PLAYER)
-           result = 0;
-         break;
+    return (door1 | door2);
+  }
 
-       case EVENT_KEYRELEASE:
-         ClearPlayerAction();
-         break;
+  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;
+  }
 
-       default:
-         HandleOtherEvents(&event);
-         break;
-      }
-    }
-    else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED)
-    {
-      int joy = AnyJoystick();
+  if (global.autoplay_leveldir)
+  {
+    door_state |= DOOR_NO_DELAY;
+    door_state &= ~DOOR_CLOSE_ALL;
+  }
 
-      if (joy & JOY_BUTTON_1)
-       result = 1;
-      else if (joy & JOY_BUTTON_2)
-       result = 0;
-    }
+  if (game_status == GAME_MODE_EDITOR)
+    door_state |= DOOR_NO_DELAY;
 
-#if 1
+  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 (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd)
-    {
-      HandleGameActions();
-    }
-    else
+    for (i = 0; i < NUM_DOORS; i++)
+      panel_has_doors[i] = FALSE;
+
+    for (i = 0; i < MAX_DOOR_PARTS; i++)
     {
-      DoAnimation();
+      struct DoorPartControlInfo *dpc = &door_part_controls[i];
+      struct GraphicInfo *g = &graphic_info[dpc->graphic];
+      int door_token = dpc->door_token;
 
-      if (!PendingEvent())     /* delay only if no pending events */
-       Delay(10);
+      door_part_done[i] = FALSE;
+      door_part_skip[i] = (!(door_state & door_token) ||
+                          !g->bitmap);
     }
 
-#if 1
-    game_status = GAME_MODE_PSEUDO_DOOR;
-#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;
 
-    BackToFront();
+      if (door_part_skip[nr])
+       continue;
 
-#if 1
-    game_status = last_game_status;    /* restore current game status */
-#endif
+      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;
 
-#else
+      if (!is_panel)
+      {
+       max_move_delay_doors_only = MAX(max_move_delay_doors_only, move_delay);
 
-    DoAnimation();
+       panel_has_doors[door_index] = TRUE;
+      }
+    }
 
-#if 1
-    if (!PendingEvent())       /* delay only if no pending events */
-      Delay(10);
-#else
-    /* don't eat all CPU time */
-    Delay(10);
-#endif
+    max_step_delay = MAX(1, max_step_delay);   // prevent division by zero
 
-#endif
-  }
+    num_move_steps = max_move_delay / max_step_delay;
+    num_move_steps_doors_only = max_move_delay_doors_only / max_step_delay;
 
-  if (game_status != GAME_MODE_MAIN)
-    StopAnimation();
+    door_delay_value = max_step_delay;
 
-  UnmapToolButtons();
+    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);
 
-#if 1
-  if (global.use_envelope_request)
-    ShowEnvelopeRequest(text, ACTION_CLOSING);
-#endif
+       if (door_state & DOOR_OPEN_1)
+         PlayMenuSoundStereo(SND_DOOR_1_OPENING, SOUND_MIDDLE);
+       if (door_state & DOOR_OPEN_2)
+         PlayMenuSoundStereo(SND_DOOR_2_OPENING, SOUND_MIDDLE);
+      }
+      else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
+      {
+        PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE);
 
-#if 1
-  if (!(req_state & REQ_STAY_OPEN) && !global.use_envelope_request)
-#else
-  if (!(req_state & REQ_STAY_OPEN))
-#endif
-  {
-    CloseDoor(DOOR_CLOSE_1);
+       if (door_state & DOOR_CLOSE_1)
+         PlayMenuSoundStereo(SND_DOOR_1_CLOSING, SOUND_MIDDLE);
+       if (door_state & DOOR_CLOSE_2)
+         PlayMenuSoundStereo(SND_DOOR_2_CLOSING, SOUND_MIDDLE);
+      }
+    }
 
-    if (((old_door_state & DOOR_OPEN_1) && !(req_state & REQ_STAY_CLOSED)) ||
-       (req_state & REQ_REOPEN))
-      OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
-  }
+    for (k = start; k < num_move_steps; k++)
+    {
+      int last_frame = num_move_steps - 1;     // last frame of this "for" loop
 
-  RemapAllGadgets();
+      door_part_done_all = TRUE;
 
-  if (game_status == GAME_MODE_PLAYING)
-  {
-    SetPanelBackground();
-    SetDrawBackgroundMask(REDRAW_DOOR_1);
-  }
-  else
-  {
-    SetDrawBackgroundMask(REDRAW_FIELD);
-  }
-
-#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 (i = 0; i < NUM_DOORS; i++)
+       door_panel_drawn[i] = FALSE;
 
-  /* restore deactivated drawing when quick-loading level tape recording */
-  if (tape.playing && tape.deactivate_display)
-    TapeDeactivateDisplayOn();
+      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;
 
-  return result;
-}
+       if (door_part_skip[nr])
+         continue;
 
-#endif
+       if (!(door_state & door_token))
+         continue;
 
-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 (!g->bitmap)
+         continue;
 
-  if (dpo1->sort_priority != dpo2->sort_priority)
-    compare_result = dpo1->sort_priority - dpo2->sort_priority;
-  else
-    compare_result = dpo1->nr - dpo2->nr;
+       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);
 
-  return compare_result;
-}
+         getFixedGraphicSource(dpc->graphic, frame, &bitmap,
+                               &g_src_x, &g_src_y);
+       }
 
-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 },
+       // draw door panel
 
-    { -1,      -1,                     -1,                     NULL    }
-  };
-  struct Rect door_rect_list[] =
-  {
-    { DX, DY, DXSIZE, DYSIZE },
-    { VX, VY, VXSIZE, VYSIZE }
-  };
-  int i, j;
+       if (!door_panel_drawn[door_index])
+       {
+         ClearRectangle(drawto, door_rect->x, door_rect->y,
+                        door_rect->width, door_rect->height);
 
-  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;
+         door_panel_drawn[door_index] = TRUE;
+       }
 
-    /* check if any door part graphic definitions have been redefined */
+       // draw opening or closing door parts
 
-    for (j = 0; door_part_controls[j].door_token != -1; j++)
-    {
-      struct DoorPartControlInfo *dpc = &door_part_controls[j];
-      struct FileInfo *fi = getImageListEntryFromImageID(dpc->graphic);
+       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 (dpc->door_token == door_token && fi->redefined)
-       door_gfx_redefined = TRUE;
-    }
+         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;
 
-    /* check for old-style door graphic/animation modifications */
+         if (dst_xx < 0)
+         {
+           src_xx = ABS(dst_xx);
+           dst_xx = 0;
+         }
 
-    if (!door_gfx_redefined)
-    {
-      if (door->anim_mode & ANIM_STATIC_PANEL)
-      {
-       door->panel.step_xoffset = 0;
-       door->panel.step_yoffset = 0;
-      }
+         width = g->width - src_xx;
 
-      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 (width > door_rect->width)
+           width = door_rect->width;
 
-       /* remove door part graphics other than the two default wings */
+         // printf("::: k == %d [%d] \n", k, start_step);
+       }
 
-       for (j = 0; door_part_controls[j].door_token != -1; j++)
+       if (pos->step_yoffset < 0)      // door part on bottom side
        {
-         struct DoorPartControlInfo *dpc = &door_part_controls[j];
-         struct GraphicInfo *g = &graphic_info[dpc->graphic];
+         src_yy = 0;
+         dst_yy = pos->y + ABS(kk * pos->step_yoffset);
+         height = g->height;
 
-         if (dpc->graphic >= part_3 &&
-             dpc->graphic <= part_8)
-           g->bitmap = NULL;
+         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 graphics and screen positions of the default wings */
+         if (dst_yy < 0)
+         {
+           src_yy = ABS(dst_yy);
+           dst_yy = 0;
+         }
 
-       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;
+         height = g->height - src_yy;
+       }
 
-       door->part_2.x = door->part_1.x;
-       door->part_2.y = door->part_1.y;
+       src_x = g_src_x + src_xx;
+       src_y = g_src_y + src_yy;
 
-       if (door->width != -1)
-       {
-         g_part_1->width = door->width;
-         g_part_2->width = door->width;
+       dst_x = door_rect->x + dst_xx;
+       dst_y = door_rect->y + dst_yy;
 
-         // 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;
-       }
+       is_panel_and_door_has_closed =
+         (is_panel &&
+          door_closing &&
+          panel_has_doors[door_index] &&
+          k >= num_move_steps_doors_only - 1);
 
-       if (door->height != -1)
+       if (width  >= 0 && width  <= g->width &&
+           height >= 0 && height <= g->height &&
+           !is_panel_and_door_has_closed)
        {
-         g_part_1->height = door->height;
-         g_part_2->height = door->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 (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);
        }
 
-       /* set animation delays for the default wings and panels */
-
-       door->part_1.step_delay = door->step_delay;
-       door->part_2.step_delay = door->step_delay;
-       door->panel.step_delay  = door->step_delay;
+       redraw_mask |= REDRAW_DOOR_FROM_TOKEN(door_token);
 
-       /* set animation draw order for the default wings */
+       if ((part_opening && (width < 0         || height < 0)) ||
+           (part_closing && (width >= g->width && height >= g->height)))
+         door_part_done[nr] = TRUE;
 
-       door->part_1.sort_priority = 2; /* draw left wing over ... */
-       door->part_2.sort_priority = 1; /*          ... right wing */
+       // 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;
+      }
 
-       /* set animation draw offset for the default wings */
+      if (!(door_state & DOOR_NO_DELAY))
+      {
+       BackToFront();
 
-       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;
+       SkipUntilDelayReached(&door_delay, door_delay_value, &k, last_frame);
 
-         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;
+       current_move_delay += max_step_delay;
 
-         num_door_steps = g_part_1->height / door->step_offset;
-       }
+       /* prevent OS (Windows) from complaining about program not responding */
+       CheckQuitEvent();
+      }
 
-       /* set animation draw offset for the default panels */
+      if (door_part_done_all)
+       break;
+    }
 
-       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;
-       }
-      }
+    if (!(door_state & DOOR_NO_DELAY))
+    {
+      /* wait for specified door action post delay */
+      if (door_state & DOOR_ACTION_1 && door_state & DOOR_ACTION_2)
+       Delay(MAX(door_1.post_delay, door_2.post_delay));
+      else if (door_state & DOOR_ACTION_1)
+       Delay(door_1.post_delay);
+      else if (door_state & DOOR_ACTION_2)
+       Delay(door_2.post_delay);
     }
   }
-}
 
-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];
-
-    /* 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;
-    }
-
-    /* fill structure for door part draw order (sorted below) */
-    dpo->nr = i;
-    dpo->sort_priority = dpc->pos->sort_priority;
-
-#if 0
-    struct DoorPartPosInfo *pos = dpc->pos;
+  if (door_state & DOOR_ACTION_1)
+    door1 = door_state & DOOR_ACTION_1;
+  if (door_state & DOOR_ACTION_2)
+    door2 = door_state & DOOR_ACTION_2;
 
-    printf(":0: step_xoffset == %d, step_yoffset == %d\n",
-          pos->step_xoffset, pos->step_yoffset);
-#endif
-  }
+  // draw masked border over door area
+  DrawMaskedBorder(REDRAW_DOOR_1);
+  DrawMaskedBorder(REDRAW_DOOR_2);
 
-  /* sort door part controls according to sort_priority and graphic number */
-  qsort(door_part_order, MAX_DOOR_PARTS,
-        sizeof(struct DoorPartOrderInfo), compareDoorPartOrderInfo);
+  return (door1 | door2);
 }
 
-unsigned int OpenDoor(unsigned int door_state)
+static boolean useSpecialEditorDoor()
 {
-  if (door_state & DOOR_COPY_BACK)
-  {
-#if 1
-    if (door_state & DOOR_OPEN_1)
-      BlitBitmap(bitmap_db_door_1, bitmap_db_door_1,
-                1 * DXSIZE, 0, DXSIZE, DYSIZE, 0 * DXSIZE, 0);
+  int graphic = IMG_GLOBAL_BORDER_EDITOR;
+  boolean redefined = getImageListEntryFromImageID(graphic)->redefined;
 
-    if (door_state & DOOR_OPEN_2)
-      BlitBitmap(bitmap_db_door_2, bitmap_db_door_2,
-                1 * VXSIZE, 0, VXSIZE, VYSIZE, 0 * VXSIZE, 0);
-#else
-    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);
+  // do not draw special editor door if editor border defined or redefined
+  if (graphic_info[graphic].bitmap != NULL || redefined)
+    return FALSE;
 
-    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);
-#endif
+  // do not draw special editor door if global border defined to be empty
+  if (graphic_info[IMG_GLOBAL_BORDER].bitmap == NULL)
+    return FALSE;
 
-    door_state &= ~DOOR_COPY_BACK;
-  }
+  // 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 MoveDoor(door_state);
+  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 1
-    if (old_door_state & DOOR_OPEN_1)
-      BlitBitmap(backbuffer, bitmap_db_door_1,
-                DX, DY, DXSIZE, DYSIZE, 0, 0);
-
-    if (old_door_state & DOOR_OPEN_2)
-      BlitBitmap(backbuffer, bitmap_db_door_2,
-                VX, VY, VXSIZE, VYSIZE, 0, 0);
-#else
-    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);
-#endif
+  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] =
 {
-#if 0
-  struct XY panel_pos_list[] =
   {
-    { DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 },
-    { DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 },
-  };
-#endif
-  struct Rect door_rect_list[] =
+    IMG_GFX_REQUEST_BUTTON_YES,                &request.button.yes,
+    TOOL_CTRL_ID_YES,                  "yes"
+  },
   {
-    { 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_GFX_REQUEST_BUTTON_NO,         &request.button.no,
+    TOOL_CTRL_ID_NO,                   "no"
+  },
   {
-    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_GFX_REQUEST_BUTTON_CONFIRM,    &request.button.confirm,
+    TOOL_CTRL_ID_CONFIRM,              "confirm"
+  },
   {
-    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_GFX_REQUEST_BUTTON_PLAYER_1,   &request.button.player_1,
+    TOOL_CTRL_ID_PLAYER_1,             "player 1"
+  },
   {
-    stepsize = 20;             /* must be chosen to always draw last frame */
-    door_delay_value = 0;
-  }
-#endif
-
-  if (global.autoplay_leveldir)
+    IMG_GFX_REQUEST_BUTTON_PLAYER_2,   &request.button.player_2,
+    TOOL_CTRL_ID_PLAYER_2,             "player 2"
+  },
   {
-    door_state |= DOOR_NO_DELAY;
-    door_state &= ~DOOR_CLOSE_ALL;
+    IMG_GFX_REQUEST_BUTTON_PLAYER_3,   &request.button.player_3,
+    TOOL_CTRL_ID_PLAYER_3,             "player 3"
+  },
+  {
+    IMG_GFX_REQUEST_BUTTON_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 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 current_move_delay = 0;
-    int k;
-
-    for (i = 0; i < NUM_DOORS; i++)
-      panel_has_doors[i] = FALSE;
-
-    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;
-      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;
-
-      if (door_part_skip[nr])
-       continue;
-
-      if (!is_panel)
-       panel_has_doors[door_index] = TRUE;
-
-      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;
-
-#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
-    }
-
-    num_move_steps = max_move_delay / max_step_delay;
-
-    door_delay_value = max_step_delay;
-
-#if 0
-    door_delay_value *= 10;
-#endif
-
-#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
-
-    for (k = 0; k < num_move_steps; k++)
-    {
-      door_part_done_all = TRUE;
-
-      for (i = 0; i < NUM_DOORS; i++)
-       door_panel_drawn[i] = FALSE;
-
-      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);
-#if 0
-       struct XY *panel_pos = &panel_pos_list[door_index];
-#endif
-       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 = (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 (k == 0 && is_panel && door_token == DOOR_2)
-         printf("::: %d, %d\n", g->width, g->height);
-#endif
-
-#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
+    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 1
-       if (door_part_skip[nr])
-         continue;
-#endif
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
 
-       if (!(door_state & door_token))
-         continue;
+    tool_gadget[id] = gi;
+  }
+}
 
-       if (!g->bitmap)
-         continue;
+void FreeToolButtons()
+{
+  int i;
 
-#if 0
-       if (current_move_delay % step_delay)
-         continue;
-#endif
+  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
+    FreeGadget(tool_gadget[i]);
+}
 
-       // draw door panel
+static void UnmapToolButtons()
+{
+  int i;
 
-       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
+  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
+    UnmapGadget(tool_gadget[i]);
+}
 
-         door_panel_drawn[door_index] = TRUE;
-       }
+static void HandleToolButtons(struct GadgetInfo *gi)
+{
+  request_gadget_id = gi->custom_id;
+}
 
-       // draw opening or closing door parts
+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 */
 
-       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;
+  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
+  },
 
-         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)
-       {
-#if 1
-         src_x = src_xx;
-         src_y = src_yy;
-#else
-         src_x = panel_pos->x + src_xx;
-         src_y = panel_pos->y + src_yy;
-#endif
-       }
-       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
-
-#if 1
-       // continue door part animations, but not panel after door has closed
-       if (!door_part_done[nr] &&
-           !(is_panel && door_closing && panel_has_doors[door_index]))
-         door_part_done_all = FALSE;
-#else
-       // 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;
-#endif
-
-#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 */
+#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,
@@ -8435,7 +6497,6 @@ em_object_mapping_list[] =
     Xsand_stonein_4,                   FALSE,  TRUE,
     EL_ROCK,                           ACTION_FILLING, -1
   },
-#if 1
   {
     Xsand_stonesand_1,                 FALSE,  FALSE,
     EL_QUICKSAND_EMPTYING,             -1, -1
@@ -8460,24 +6521,6 @@ em_object_mapping_list[] =
     Xsand_stonesand_quickout_2,                FALSE,  FALSE,
     EL_QUICKSAND_EMPTYING,             -1, -1
   },
-#else
-  {
-    Xsand_stonesand_1,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-  {
-    Xsand_stonesand_2,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-  {
-    Xsand_stonesand_3,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-  {
-    Xsand_stonesand_4,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-#endif
   {
     Xsand_stoneout_1,                  FALSE,  FALSE,
     EL_ROCK,                           ACTION_EMPTYING, -1
@@ -8486,7 +6529,6 @@ em_object_mapping_list[] =
     Xsand_stoneout_2,                  FALSE,  FALSE,
     EL_ROCK,                           ACTION_EMPTYING, -1
   },
-#if 1
   {
     Xsand_sandstone_1,                 FALSE,  FALSE,
     EL_QUICKSAND_FILLING,              -1, -1
@@ -8503,24 +6545,6 @@ em_object_mapping_list[] =
     Xsand_sandstone_4,                 FALSE,  FALSE,
     EL_QUICKSAND_FILLING,              -1, -1
   },
-#else
-  {
-    Xsand_sandstone_1,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-  {
-    Xsand_sandstone_2,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-  {
-    Xsand_sandstone_3,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-  {
-    Xsand_sandstone_4,                 FALSE,  FALSE,
-    EL_QUICKSAND_FULL,                 -1, -1
-  },
-#endif
   {
     Xplant,                            TRUE,   FALSE,
     EL_EMC_PLANT,                      -1, -1
@@ -8903,7 +6927,7 @@ em_object_mapping_list[] =
   },
   {
     Xalpha_copyr,                      TRUE,   FALSE,
-    EL_CHAR('©'),                      -1, -1
+    EL_CHAR(CHAR_BYTE_COPYRIGHT),      -1, -1
   },
 
   {
@@ -9286,1258 +7310,759 @@ void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
   }
 
   if (level->num_android_clone_elements == 0)
-  {
-    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;
-}
-
-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)
-  {
-    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];
+  {
+    level->num_android_clone_elements = 1;
+    level->android_clone_element[0] = EL_EMPTY;
+  }
 }
 
-int el2edimg(int element)
+int map_direction_RND_to_EM(int direction)
 {
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
+  return (direction == MV_UP    ? 0 :
+         direction == MV_RIGHT ? 1 :
+         direction == MV_DOWN  ? 2 :
+         direction == MV_LEFT  ? 3 :
+         -1);
 }
 
-int el2preimg(int element)
+int map_direction_EM_to_RND(int direction)
 {
-  element = GFX_ELEMENT(element);
-
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
+  return (direction == 0 ? MV_UP    :
+         direction == 1 ? MV_RIGHT :
+         direction == 2 ? MV_DOWN  :
+         direction == 3 ? MV_LEFT  :
+         MV_NONE);
 }
 
-int el2panelimg(int element)
+int map_element_RND_to_SP(int element_rnd)
 {
-  element = GFX_ELEMENT(element);
+  int element_sp = 0x20;       /* map unknown elements to yellow "hardware" */
 
-  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PANEL];
-}
+  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;
 
-int font2baseimg(int font_nr)
-{
-  return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
+  return element_sp;
 }
 
-int getBeltNrFromBeltElement(int element)
+int map_element_SP_to_RND(int element_sp)
 {
-  return (element < EL_CONVEYOR_BELT_2_LEFT ? 0 :
-         element < EL_CONVEYOR_BELT_3_LEFT ? 1 :
-         element < EL_CONVEYOR_BELT_4_LEFT ? 2 : 3);
-}
+  int element_rnd = EL_UNKNOWN;
 
-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 (element_sp >= 0x00 &&
+      element_sp <= 0x27)
+    element_rnd = EL_SP_START + element_sp;
+  else if (element_sp == 0x28)
+    element_rnd = EL_INVISIBLE_WALL;
 
-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);
+  return element_rnd;
 }
 
-int getBeltDirNrFromBeltElement(int element)
+int map_action_SP_to_RND(int action_sp)
 {
-  static int belt_base_element[4] =
+  switch (action_sp)
   {
-    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];
+    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;
 
-  return (belt_dir_nr % 3);
+    default:                   return ACTION_DEFAULT;
+  }
 }
 
-int getBeltDirNrFromBeltSwitchElement(int element)
+int map_element_RND_to_MM(int element_rnd)
 {
-  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
-  };
+  return (element_rnd >= EL_MM_START_1 &&
+         element_rnd <= EL_MM_END_1 ?
+         EL_MM_START_1_NATIVE + element_rnd - EL_MM_START_1 :
 
-  int belt_nr = getBeltNrFromBeltSwitchElement(element);
-  int belt_dir_nr = element - belt_base_element[belt_nr];
+         element_rnd >= EL_MM_START_2 &&
+         element_rnd <= EL_MM_END_2 ?
+         EL_MM_START_2_NATIVE + element_rnd - EL_MM_START_2 :
 
-  return (belt_dir_nr % 3);
-}
+         element_rnd >= EL_CHAR_START &&
+         element_rnd <= EL_CHAR_END ?
+         EL_MM_CHAR_START_NATIVE + element_rnd - EL_CHAR_START :
 
-int getBeltDirFromBeltElement(int element)
-{
-  static int belt_move_dir[3] =
-  {
-    MV_LEFT,
-    MV_NONE,
-    MV_RIGHT
-  };
+         element_rnd >= EL_MM_RUNTIME_START &&
+         element_rnd <= EL_MM_RUNTIME_END ?
+         EL_MM_RUNTIME_START_NATIVE + element_rnd - EL_MM_RUNTIME_START :
 
-  int belt_dir_nr = getBeltDirNrFromBeltElement(element);
+         element_rnd >= EL_MM_DUMMY_START &&
+         element_rnd <= EL_MM_DUMMY_END ?
+         EL_MM_DUMMY_START_NATIVE + element_rnd - EL_MM_DUMMY_START :
 
-  return belt_move_dir[belt_dir_nr];
+         EL_MM_EMPTY_NATIVE);
 }
 
-int getBeltDirFromBeltSwitchElement(int element)
+int map_element_MM_to_RND(int element_mm)
 {
-  static int belt_move_dir[3] =
-  {
-    MV_LEFT,
-    MV_NONE,
-    MV_RIGHT
-  };
+  return (element_mm == EL_MM_EMPTY_NATIVE ||
+         element_mm == EL_DF_EMPTY_NATIVE ?
+         EL_EMPTY :
 
-  int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(element);
+         element_mm >= EL_MM_START_1_NATIVE &&
+         element_mm <= EL_MM_END_1_NATIVE ?
+         EL_MM_START_1 + element_mm - EL_MM_START_1_NATIVE :
 
-  return belt_move_dir[belt_dir_nr];
-}
+         element_mm >= EL_MM_START_2_NATIVE &&
+         element_mm <= EL_MM_END_2_NATIVE ?
+         EL_MM_START_2 + element_mm - EL_MM_START_2_NATIVE :
 
-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
-  };
+         element_mm >= EL_MM_CHAR_START_NATIVE &&
+         element_mm <= EL_MM_CHAR_END_NATIVE ?
+         EL_CHAR_START + element_mm - EL_MM_CHAR_START_NATIVE :
 
-  return belt_base_element[belt_nr] + belt_dir_nr;
-}
+         element_mm >= EL_MM_RUNTIME_START_NATIVE &&
+         element_mm <= EL_MM_RUNTIME_END_NATIVE ?
+         EL_MM_RUNTIME_START + element_mm - EL_MM_RUNTIME_START_NATIVE :
 
-int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
-{
-  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
+         element_mm >= EL_MM_DUMMY_START_NATIVE &&
+         element_mm <= EL_MM_DUMMY_END_NATIVE ?
+         EL_MM_DUMMY_START + element_mm - EL_MM_DUMMY_START_NATIVE :
 
-  return getBeltElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
+         EL_EMPTY);
 }
 
-int getBeltSwitchElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr)
+int map_action_MM_to_RND(int action_mm)
 {
-  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
-  };
-
-  return belt_base_element[belt_nr] + belt_dir_nr;
+  /* all MM actions are defined to exactly match their RND counterparts */
+  return action_mm;
 }
 
-int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
+int map_sound_MM_to_RND(int sound_mm)
 {
-  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
+  switch (sound_mm)
+  {
+    case SND_MM_GAME_LEVELTIME_CHARGING:
+      return SND_GAME_LEVELTIME_CHARGING;
 
-  return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
-}
+    case SND_MM_GAME_HEALTH_CHARGING:
+      return SND_GAME_HEALTH_CHARGING;
 
-#if 1
-boolean getTeamMode_EM()
-{
-  return game.team_mode;
+    default:
+      return SND_UNDEFINED;
+  }
 }
-#else
-int getNumActivePlayers_EM()
-{
-#if 1
-  int num_players = 0;
-  int i;
 
-  if (!tape.playing)
-    return (setup.team_mode ? MAX_PLAYERS : 1);
-
-  for (i = 0; i < MAX_PLAYERS; i++)
-    if (tape.player_participates[i])
-      num_players++;
+int map_mm_wall_element(int element)
+{
+  return (element >= EL_MM_STEEL_WALL_START &&
+         element <= EL_MM_STEEL_WALL_END ?
+         EL_MM_STEEL_WALL :
 
-  return (num_players > 1 ? MAX_PLAYERS : 1);
+         element >= EL_MM_WOODEN_WALL_START &&
+         element <= EL_MM_WOODEN_WALL_END ?
+         EL_MM_WOODEN_WALL :
 
-#else
+         element >= EL_MM_ICE_WALL_START &&
+         element <= EL_MM_ICE_WALL_END ?
+         EL_MM_ICE_WALL :
 
-  int num_players = 0;
-  int i;
+         element >= EL_MM_AMOEBA_WALL_START &&
+         element <= EL_MM_AMOEBA_WALL_END ?
+         EL_MM_AMOEBA_WALL :
 
-  /* when recording game, activate all connected players */
-  if (!tape.playing)
-    return -1;
+         element >= EL_DF_STEEL_WALL_START &&
+         element <= EL_DF_STEEL_WALL_END ?
+         EL_DF_STEEL_WALL :
 
-  for (i = 0; i < MAX_PLAYERS; i++)
-    if (tape.player_participates[i])
-      num_players++;
+         element >= EL_DF_WOODEN_WALL_START &&
+         element <= EL_DF_WOODEN_WALL_END ?
+         EL_DF_WOODEN_WALL :
 
-  return num_players;
-#endif
+         element);
 }
-#endif
 
-int getGameFrameDelay_EM(int native_em_game_frame_delay)
+int map_mm_wall_element_editor(int element)
 {
-  int game_frame_delay_value;
+  switch (element)
+  {
+    case EL_MM_STEEL_WALL:     return EL_MM_STEEL_WALL_START;
+    case EL_MM_WOODEN_WALL:    return EL_MM_WOODEN_WALL_START;
+    case EL_MM_ICE_WALL:       return EL_MM_ICE_WALL_START;
+    case EL_MM_AMOEBA_WALL:    return EL_MM_AMOEBA_WALL_START;
+    case EL_DF_STEEL_WALL:     return EL_DF_STEEL_WALL_START;
+    case EL_DF_WOODEN_WALL:    return EL_DF_WOODEN_WALL_START;
 
-  game_frame_delay_value =
-    (tape.playing && tape.fast_forward ? FfwdFrameDelay :
-     GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
-     GameFrameDelay);
+    default:                   return element;
+  }
+}
 
-  if (tape.playing && tape.warp_forward && !tape.pausing)
-    game_frame_delay_value = 0;
+int get_next_element(int element)
+{
+  switch (element)
+  {
+    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;
 
-  return game_frame_delay_value;
+    default:                           return element;
+  }
 }
 
-unsigned int InitRND(int seed)
+int el2img_mm(int element_mm)
 {
-  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);
+  return el2img(map_element_MM_to_RND(element_mm));
 }
 
-#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
-
-inline static int get_effective_element_EM(int tile, int frame_em)
+int el_act_dir2img(int element, int action, int direction)
 {
-  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);
+  element = GFX_ELEMENT(element);
+  direction = MV_DIR_TO_BIT(direction);        /* default: MV_NONE => MV_DOWN */
 
-  if (frame_em < 7)
-  {
-    switch (tile)
-    {
-      case Yacid_splash_eB:
-      case Yacid_splash_wB:
-       return (frame_em > 5 ? EL_EMPTY : element);
+  /* direction_graphic[][] == graphic[] for undefined direction graphics */
+  return element_info[element].direction_graphic[action][direction];
+}
 
-#if 0
-       /* !!! FIX !!! */
-      case Ydiamond_stone:
-       //  if (!game.use_native_emc_graphics_engine)
-       return EL_ROCK;
-#endif
+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 */
 
-      default:
-       return element;
-    }
-  }
-  else /* frame_em == 7 */
-  {
-    switch (tile)
-    {
-      case Yacid_splash_eB:
-      case Yacid_splash_wB:
-       return EL_EMPTY;
+  /* direction_graphic[][] == graphic[] for undefined direction graphics */
+  return element_info[element].direction_crumbled[action][direction];
+}
 
-      case Yemerald_stone:
-       return EL_EMERALD;
+int el_act2img(int element, int action)
+{
+  element = GFX_ELEMENT(element);
 
-      case Ydiamond_stone:
-       return EL_ROCK;
+  return element_info[element].graphic[action];
+}
 
-      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;
+int el_act2crm(int element, int action)
+{
+  element = GFX_ELEMENT(element);
 
-      default:
-       return (is_backside || action_removing ? EL_EMPTY : element);
-    }
-  }
+  return element_info[element].crumbled[action];
 }
 
-inline static boolean check_linear_animation_EM(int tile)
+int el_dir2img(int element, int direction)
 {
-  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 el_act_dir2img(element, ACTION_DEFAULT, direction);
 }
 
-inline static void set_crumbled_graphics_EM(struct GraphicInfo_EM *g_em,
-                                           boolean has_crumbled_graphics,
-                                           int crumbled, int sync_frame)
+int el2baseimg(int element)
 {
-  /* 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;
+  return element_info[element].graphic[ACTION_DEFAULT];
+}
 
-  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);
+int el2img(int element)
+{
+  element = GFX_ELEMENT(element);
 
-    getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap,
-                    &g_em->crumbled_src_x, &g_em->crumbled_src_y);
+  return element_info[element].graphic[ACTION_DEFAULT];
+}
 
-    g_em->crumbled_border_size = graphic_info[crumbled].border_size;
+int el2edimg(int element)
+{
+  element = GFX_ELEMENT(element);
 
-    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;
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR];
+}
 
-    g_em->has_crumbled_graphics = FALSE;
-  }
+int el2preimg(int element)
+{
+  element = GFX_ELEMENT(element);
+
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW];
 }
 
-void ResetGfxAnimation_EM(int x, int y, int tile)
+int el2panelimg(int element)
 {
-  GfxFrame[x][y] = 0;
+  element = GFX_ELEMENT(element);
+
+  return element_info[element].special_graphic[GFX_SPECIAL_ARG_PANEL];
 }
 
-void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em,
-                       int tile, int frame_em, int x, int y)
+int font2baseimg(int font_nr)
 {
-  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);
+  return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
+}
 
-  /* 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));
+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);
+}
 
-    g = &graphic_info[graphic];
-  }
+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 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
+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);
+}
 
-#if 1
-  if ((action_removing || check_linear_animation_EM(tile)) && frame_em == 0)
+int getBeltDirNrFromBeltElement(int element)
+{
+  static int belt_base_element[4] =
   {
-    GfxFrame[x][y] = 0;
+    EL_CONVEYOR_BELT_1_LEFT,
+    EL_CONVEYOR_BELT_2_LEFT,
+    EL_CONVEYOR_BELT_3_LEFT,
+    EL_CONVEYOR_BELT_4_LEFT
+  };
 
-    // printf("::: resetting... [%d]\n", tile);
-  }
-#else
-  if (action_removing || check_linear_animation_EM(tile))
-  {
-    GfxFrame[x][y] = frame_em;
+  int belt_nr = getBeltNrFromBeltElement(element);
+  int belt_dir_nr = element - belt_base_element[belt_nr];
 
-    // printf("::: resetting... [%d]\n", tile);
-  }
-#endif
-  else if (action_moving)
+  return (belt_dir_nr % 3);
+}
+
+int getBeltDirNrFromBeltSwitchElement(int element)
+{
+  static int belt_base_element[4] =
   {
-    boolean is_backside = object_mapping[tile].is_backside;
+    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 (is_backside)
-    {
-      int direction = object_mapping[tile].direction;
-      int move_dir = (action_falling ? MV_DOWN : direction);
+  int belt_nr = getBeltNrFromBeltSwitchElement(element);
+  int belt_dir_nr = element - belt_base_element[belt_nr];
 
-      GfxFrame[x][y]++;
+  return (belt_dir_nr % 3);
+}
 
-#if 1
-      /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */
-      if (g->double_movement && frame_em == 0)
-      {
-       GfxFrame[x][y] = 0;
+int getBeltDirFromBeltElement(int element)
+{
+  static int belt_move_dir[3] =
+  {
+    MV_LEFT,
+    MV_NONE,
+    MV_RIGHT
+  };
 
-       // printf("::: resetting... [%d]\n", tile);
-      }
-#endif
+  int belt_dir_nr = getBeltDirNrFromBeltElement(element);
 
-      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
+  return belt_move_dir[belt_dir_nr];
+}
+
+int getBeltDirFromBeltSwitchElement(int element)
+{
+  static int belt_move_dir[3] =
   {
-    GfxFrame[x][y]++;
+    MV_LEFT,
+    MV_NONE,
+    MV_RIGHT
+  };
 
-    /* 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]++;
-  }
+  int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(element);
 
-#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
+  return belt_move_dir[belt_dir_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) */
+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
+  };
 
-  SetRandomAnimationValue(x, y);
+  return belt_base_element[belt_nr] + belt_dir_nr;
+}
 
-  int frame = getAnimationFrame(g->anim_frames,
-                               g->anim_delay,
-                               g->anim_mode,
-                               g->anim_start_frame,
-                               sync_frame);
+int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir)
+{
+  int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1);
 
-  g_em->unique_identifier =
-    (graphic << 16) | ((frame % 8) << 12) | (g_em->width << 6) | g_em->height;
-#endif
+  return getBeltElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr);
 }
 
-void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em,
-                                 int tile, int frame_em, int x, int y)
+int getBeltSwitchElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr)
 {
-  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_base_element[4] =
   {
-    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));
+    EL_CONVEYOR_BELT_1_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_2_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_3_SWITCH_LEFT,
+    EL_CONVEYOR_BELT_4_SWITCH_LEFT
+  };
 
-    g = &graphic_info[graphic];
-  }
+  return belt_base_element[belt_nr] + belt_dir_nr;
+}
 
-#if 0
-  if (frame_em == 7)
-    return;
-#endif
+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);
+}
 
-#if 0
-  if (frame_em == 0)   /* reset animation frame for certain elements */
-  {
-    if (check_linear_animation_EM(tile))
-      GfxFrame[x][y] = 0;
-  }
-#endif
+boolean getTeamMode_EM()
+{
+  return game.team_mode;
+}
 
-  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) */
+int getGameFrameDelay_EM(int native_em_game_frame_delay)
+{
+  int game_frame_delay_value;
 
-  SetRandomAnimationValue(x, y);
+  game_frame_delay_value =
+    (tape.playing && tape.fast_forward ? FfwdFrameDelay :
+     GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
+     GameFrameDelay);
 
-#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
+  if (tape.playing && tape.warp_forward && !tape.pausing)
+    game_frame_delay_value = 0;
 
-#if 0
-  int xxx_effective_action;
-  int xxx_has_action_graphics;
+  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 if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
+    return InitEngineRandom_MM(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;
 
-      xxx_effective_action = effective_action;
-      xxx_has_action_graphics = has_action_graphics;
+      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;
+
+      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->crumbled_tile_size = graphic_info[crumbled].tile_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;
+    g_em->crumbled_tile_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);
 
-  /* (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);
+      GfxFrame[x][y]++;
 
-#else
+#if 1
+      /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */
+      if (g->double_movement && frame_em == 0)
+       GfxFrame[x][y] = 0;
+#endif
 
-  g_em->crumbled_bitmap = NULL;
-  g_em->crumbled_src_x = 0;
-  g_em->crumbled_src_y = 0;
+      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]++;
 
-  g_em->has_crumbled_graphics = FALSE;
+    /* 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]++;
+  }
 
-  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);
+  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) */
 
-    getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap,
-                    &g_em->crumbled_src_x, &g_em->crumbled_src_y);
+  SetRandomAnimationValue(x, y);
 
-    g_em->has_crumbled_graphics = TRUE;
-  }
-#endif
+  int frame = getAnimationFrame(g->anim_frames,
+                               g->anim_delay,
+                               g->anim_mode,
+                               g->anim_start_frame,
+                               sync_frame);
 
-#if 0
- {
-   int effective_action = xxx_effective_action;
-   int has_action_graphics = xxx_has_action_graphics;
+  g_em->unique_identifier =
+    (graphic << 16) | ((frame % 8) << 12) | (g_em->width << 6) | g_em->height;
+}
 
-      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);
+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 (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;
-         }
-       }
+  /* 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_em->width  = TILEX - cx * step;
-       g_em->height = TILEY - cy * step;
-      }
+    g = &graphic_info[graphic];
+  }
 
-      /* 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
+  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) */
+
+  SetRandomAnimationValue(x, y);
+
+  int frame = getAnimationFrame(g->anim_frames,
+                               g->anim_delay,
+                               g->anim_mode,
+                               g->anim_start_frame,
+                               sync_frame);
 
+  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,
@@ -10566,22 +8091,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
@@ -10653,11 +8166,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) &&
@@ -10667,42 +8175,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 :
@@ -10744,9 +8217,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;
@@ -10885,75 +8355,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 ||
@@ -11244,47 +8648,74 @@ 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 (frame == 0 && !any_player_dropping)
   {
-#if 0
-    boolean active_players = FALSE;
-    int i;
+    if (!local_player->was_waiting)
+    {
+      if (!CheckSaveEngineSnapshotToList())
+       return;
 
-    for (i = 0; i < MAX_PLAYERS; i++)
-      if (action[i] != JOY_NO_ACTION)
-       active_players = TRUE;
-#endif
+      local_player->was_waiting = TRUE;
+    }
+  }
+  else if (any_player_moving || any_player_snapping || any_player_dropping)
+  {
+    local_player->was_waiting = FALSE;
+  }
+}
 
-    // if (frame == 0)
-    if (frame == 0 && !player_is_dropping)
-      TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+void CheckSaveEngineSnapshot_SP(boolean murphy_is_waiting,
+                               boolean murphy_is_dropping)
+{
+  if (murphy_is_waiting)
+  {
+    if (!local_player->was_waiting)
+    {
+      if (!CheckSaveEngineSnapshotToList())
+       return;
+
+      local_player->was_waiting = TRUE;
+    }
   }
+  else
+  {
+    local_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 0
-  printf("::: waiting: %d, dropping: %d\n",
-        murphy_is_waiting, murphy_is_dropping);
-#endif
+  boolean murphy_starts_dropping = FALSE;
+  int i;
 
-  if (tape.single_step && tape.recording && !tape.pausing)
-  {
-    // if (murphy_is_waiting || murphy_is_dropping)
-    if (murphy_is_waiting)
-    {
-#if 0
-      printf("::: murphy is waiting -> pause mode\n");
-#endif
+  for (i = 0; i < MAX_PLAYERS; i++)
+    if (stored_player[i].force_dropping)
+      murphy_starts_dropping = TRUE;
 
+  if (tape.single_step && tape.recording && !tape.pausing)
+    if (murphy_is_waiting && !murphy_starts_dropping)
       TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
-    }
-  }
+
+  CheckSaveEngineSnapshot_SP(murphy_is_waiting, murphy_is_dropping);
 }
 
 void getGraphicSource_SP(struct GraphicInfo_SP *g_sp,
@@ -11371,7 +8802,37 @@ void PlayMenuMusicExt(int music)
 
 void PlayMenuMusic()
 {
-  PlayMenuMusicExt(menu.music[game_status]);
+  char *curr_music = getCurrentlyPlayingMusicFilename();
+  char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
+
+  if (!strEqual(curr_music, next_music))
+    PlayMenuMusicExt(menu.music[game_status]);
+}
+
+void PlayMenuSoundsAndMusic()
+{
+  PlayMenuSound();
+  PlayMenuMusic();
+}
+
+static void FadeMenuSounds()
+{
+  FadeSounds();
+}
+
+static void FadeMenuMusic()
+{
+  char *curr_music = getCurrentlyPlayingMusicFilename();
+  char *next_music = getMusicInfoEntryFilename(menu.music[game_status]);
+
+  if (!strEqual(curr_music, next_music))
+    FadeMusic();
+}
+
+void FadeMenuSoundsAndMusic()
+{
+  FadeMenuSounds();
+  FadeMenuMusic();
 }
 
 void PlaySoundActivating()
@@ -11392,9 +8853,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
 {
   boolean change_fullscreen = (setup.fullscreen !=
                               video.fullscreen_enabled);
-  boolean change_fullscreen_mode = (video.fullscreen_enabled &&
-                                   !strEqual(setup.fullscreen_mode,
-                                             video.fullscreen_mode_current));
   boolean change_window_scaling_percent = (!video.fullscreen_enabled &&
                                           setup.window_scaling_percent !=
                                           video.window_scaling_percent);
@@ -11424,7 +8882,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
 #endif
 
   if (change_fullscreen ||
-      change_fullscreen_mode ||
       change_window_scaling_percent)
   {
     Bitmap *tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
@@ -11432,12 +8889,6 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded()
     /* save backbuffer content which gets lost when toggling fullscreen mode */
     BlitBitmap(backbuffer, tmp_backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 
-    if (change_fullscreen_mode)
-    {
-      /* keep fullscreen, but change fullscreen mode (screen resolution) */
-      video.fullscreen_enabled = FALSE;                /* force new fullscreen mode */
-    }
-
     if (change_window_scaling_percent)
     {
       /* keep window mode, but change window scaling */
@@ -11455,36 +8906,112 @@ 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 SetAnimStatus(int anim_status_new)
+{
+  if (anim_status_new == GAME_MODE_MAIN)
+    anim_status_new = GAME_MODE_PSEUDO_MAINONLY;
+  else if (anim_status_new == GAME_MODE_SCORES)
+    anim_status_new = GAME_MODE_PSEUDO_SCORESOLD;
+
+  global.anim_status_next = anim_status_new;
+
+  // directly set screen modes that are entered without fading
+  if ((global.anim_status      == GAME_MODE_PSEUDO_MAINONLY &&
+       global.anim_status_next == GAME_MODE_PSEUDO_TYPENAME) ||
+      (global.anim_status      == GAME_MODE_PSEUDO_TYPENAME &&
+       global.anim_status_next == GAME_MODE_PSEUDO_MAINONLY))
+    global.anim_status = global.anim_status_next;
+}
+
+void SetGameStatus(int game_status_new)
+{
+  if (game_status_new != game_status)
+    game_status_last_screen = game_status;
+
+  game_status = game_status_new;
+
+  SetAnimStatus(game_status_new);
+}
+
+void SetFontStatus(int game_status_new)
+{
+  static int last_game_status = -1;
+
+  if (game_status_new != -1)
+  {
+    // set game status for font use after storing last game status
+    last_game_status = game_status;
+    game_status = game_status_new;
+  }
+  else
+  {
+    // reset game status after font use from last stored game status
+    game_status = last_game_status;
+  }
+}
+
+void ResetFontStatus()
+{
+  SetFontStatus(-1);
+}
+
+boolean CheckIfPlayfieldViewportHasChanged()
+{
+  // if game status has not changed, playfield viewport has not changed either
+  if (game_status == game_status_last)
+    return FALSE;
+
+  // check if playfield viewport has changed with current game status
+  struct RectWithBorder *vp_playfield = &viewport.playfield[game_status];
+  int new_real_sx      = vp_playfield->x;
+  int new_real_sy      = vp_playfield->y;
+  int new_full_sxsize  = vp_playfield->width;
+  int new_full_sysize  = vp_playfield->height;
+
+  return (new_real_sx != REAL_SX ||
+         new_real_sy != REAL_SY ||
+         new_full_sxsize != FULL_SXSIZE ||
+         new_full_sysize != FULL_SYSIZE);
+}
+
+boolean CheckIfGlobalBorderOrPlayfieldViewportHasChanged()
+{
+  return (CheckIfGlobalBorderHasChanged() ||
+         CheckIfPlayfieldViewportHasChanged());
+}
+
 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
-#if 1
+  boolean use_mini_tilesize = (level.game_engine_type == GAME_ENGINE_TYPE_MM ?
+                              FALSE : setup.small_game_graphics);
   int gfx_game_mode = game_status;
-#else
-  int gfx_game_mode = (game_status == GAME_MODE_PLAYING ||
-                      game_status == GAME_MODE_EDITOR ? game_status :
-                      GAME_MODE_MAIN);
-#endif
   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;
@@ -11506,49 +9033,27 @@ 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 = (use_mini_tilesize ? 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_gadgets_and_anims = 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
+    init_gadgets_and_anims = TRUE;
 
     // printf("::: video: init_video_buffer, init_gfx_buffers\n");
   }
@@ -11564,20 +9069,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 ||
@@ -11599,27 +9090,60 @@ 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
       )
   {
-#if 1
+    // ------------------------------------------------------------------------
+    // 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
-      FreeEngineSnapshot();
+      FreeEngineSnapshotSingle();
 
       // changing tile size requires update of graphic mapping for EM engine
       init_em_graphics = TRUE;
     }
-#endif
 
     SX = new_sx;
     SY = new_sy;
@@ -11643,40 +9167,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_anims = 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_anims\n");
   }
 
   if (init_gfx_buffers)
@@ -11690,6 +9185,9 @@ void ChangeViewportPropertiesIfNeeded()
 
     SCR_FIELDX = new_scr_fieldx;
     SCR_FIELDY = new_scr_fieldy;
+
+    SetDrawDeactivationMask(REDRAW_NONE);
+    SetDrawBackgroundMask(REDRAW_FIELD);
   }
 
   if (init_video_buffer)
@@ -11697,25 +9195,19 @@ void ChangeViewportPropertiesIfNeeded()
     // printf("::: init_video_buffer\n");
 
     InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen);
-
-    SetDrawDeactivationMask(REDRAW_NONE);
-    SetDrawBackgroundMask(REDRAW_FIELD);
+    InitImageTextures();
   }
 
-  if (init_gadgets_and_toons)
+  if (init_gadgets_and_anims)
   {
-    // printf("::: init_gadgets_and_toons\n");
+    // printf("::: init_gadgets_and_anims\n");
 
     InitGadgets();
-    InitToons();
+    InitGlobalAnimations();
   }
 
   if (init_em_graphics)
   {
       InitGraphicInfo_EM();
   }
-
-#if 0
-  printf("::: %d, %d  /  %d, %d [%d]\n", VX, VY, EX, EY, game_status);
-#endif
 }