rnd-20030208-2-src
[rocksndiamonds.git] / src / tools.c
index 53290c195d93d05deb93c5ba8f24387e6cedbddc..b20e04cb85ef05904d15107494bb2b9f59a54ce9 100644 (file)
@@ -1,39 +1,46 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+* (c) 1995-2002 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  tools.c                                                 *
+* tools.c                                                  *
 ***********************************************************/
 
-#ifdef __FreeBSD__
-#include <machine/joystick.h>
-#endif
+#include "libgame/libgame.h"
 
 #include "tools.h"
 #include "game.h"
 #include "events.h"
-#include "sound.h"
-#include "misc.h"
-#include "buttons.h"
-#include "joystick.h"
 #include "cartoons.h"
+#include "network.h"
+#include "tape.h"
 
-#include <math.h>
+/* tool button identifiers */
+#define TOOL_CTRL_ID_YES       0
+#define TOOL_CTRL_ID_NO                1
+#define TOOL_CTRL_ID_CONFIRM   2
+#define TOOL_CTRL_ID_PLAYER_1  3
+#define TOOL_CTRL_ID_PLAYER_2  4
+#define TOOL_CTRL_ID_PLAYER_3  5
+#define TOOL_CTRL_ID_PLAYER_4  6
 
-#ifdef MSDOS
-extern BOOL wait_for_vsync;
-#endif
+#define NUM_TOOL_BUTTONS       7
+
+/* forward declaration for internal use */
+static void UnmapToolButtons();
+static void HandleToolButtons(struct GadgetInfo *);
+
+static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS];
+static int request_gadget_id = -1;
 
 void SetDrawtoField(int mode)
 {
-  if (mode == DRAW_BUFFERED && soft_scrolling_on)
+  if (mode == DRAW_BUFFERED && setup.soft_scrolling)
   {
     FX = TILEX;
     FY = TILEY;
@@ -61,112 +68,195 @@ void SetDrawtoField(int mode)
   }
 }
 
+void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height)
+{
+  if (game_status == PLAYING)
+  {
+    if (force_redraw)
+    {
+      x = gfx.sx - TILEX;
+      y = gfx.sy - TILEY;
+      width = gfx.sxsize + 2 * TILEX;
+      height = gfx.sysize + 2 * TILEY;
+    }
+
+    if (force_redraw || setup.direct_draw)
+    {
+      int xx, yy;
+      int x1 = (x - SX) / TILEX, y1 = (y - SY) / TILEY;
+      int x2 = (x - SX + width) / TILEX, y2 = (y - SY + height) / TILEY;
+
+      if (setup.direct_draw)
+       SetDrawtoField(DRAW_BACKBUFFER);
+
+      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.direct_draw)
+       SetDrawtoField(DRAW_DIRECT);
+    }
+
+    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);
+    }
+  }
+
+  BlitBitmap(drawto, window, x, y, width, height, x, y);
+}
+
 void BackToFront()
 {
   int x,y;
-  Drawable buffer = (drawto_field != window ? drawto_field : backbuffer);
+  DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field);
 
-  if (direct_draw_on && game_status == PLAYING)
+  if (setup.direct_draw && game_status == PLAYING)
     redraw_mask &= ~REDRAW_MAIN;
 
   if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
     redraw_mask |= REDRAW_FIELD;
 
-  if (redraw_mask & REDRAW_FIELD || ScreenMovPos)
+  if (redraw_mask & REDRAW_FIELD)
     redraw_mask &= ~REDRAW_TILES;
 
-  if (!redraw_mask)
+  if (redraw_mask == REDRAW_NONE)
     return;
 
+  if (global.fps_slowdown && game_status == PLAYING)
+  {
+    static boolean last_frame_skipped = FALSE;
+    boolean skip_even_when_not_scrolling = TRUE;
+    boolean just_scrolling = (ScreenMovDir != 0);
+    boolean verbose = FALSE;
+
+    if (global.fps_slowdown_factor > 1 &&
+       (FrameCounter % global.fps_slowdown_factor) &&
+       (just_scrolling || skip_even_when_not_scrolling))
+    {
+      redraw_mask &= ~REDRAW_MAIN;
+
+      last_frame_skipped = TRUE;
+
+      if (verbose)
+       printf("FRAME SKIPPED\n");
+    }
+    else
+    {
+      if (last_frame_skipped)
+       redraw_mask |= REDRAW_FIELD;
+
+      last_frame_skipped = FALSE;
+
+      if (verbose)
+       printf("frame not skipped\n");
+    }
+  }
+
+  /* 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 */
+
+  SyncDisplay();
+
   if (redraw_mask & REDRAW_ALL)
   {
-    XCopyArea(display,backbuffer,window,gc,
-             0,0, WIN_XSIZE,WIN_YSIZE,
-             0,0);
+    BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
     redraw_mask = 0;
   }
 
   if (redraw_mask & REDRAW_FIELD)
   {
-#ifdef MSDOS
-    wait_for_vsync = TRUE;
-#endif
     if (game_status != PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER)
-      XCopyArea(display,backbuffer,window,gc,
-               REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
-               REAL_SX,REAL_SY);
+    {
+      BlitBitmap(backbuffer, window,
+                REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
+    }
     else
     {
       int fx = FX, fy = FY;
 
-      if (soft_scrolling_on)
+      if (setup.soft_scrolling)
       {
-       fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
-       fy += (PlayerMovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
+       fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
+       fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
       }
 
-      XCopyArea(display,buffer,window,gc,
-               fx,fy, SXSIZE,SYSIZE,
-               SX,SY);
-
-
+      if (setup.soft_scrolling ||
+         ABS(ScreenMovPos) + ScrollStepSize == TILEX ||
+         ABS(ScreenMovPos) == ScrollStepSize ||
+         redraw_tiles > REDRAWTILES_THRESHOLD)
+      {
+       BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY);
 
+#ifdef DEBUG
 #if 0
-      printf("FULL SCREEN REDRAW [%d]\n", ScreenMovPos);
+       printf("redrawing all (ScreenGfxPos == %d) because %s\n",
+              ScreenGfxPos,
+              (setup.soft_scrolling ?
+               "setup.soft_scrolling" :
+               ABS(ScreenGfxPos) + ScrollStepSize == TILEX ?
+               "ABS(ScreenGfxPos) + ScrollStepSize == TILEX" :
+               ABS(ScreenGfxPos) == ScrollStepSize ?
+               "ABS(ScreenGfxPos) == ScrollStepSize" :
+               "redraw_tiles > REDRAWTILES_THRESHOLD"));
 #endif
-
-
-
+#endif
+      }
     }
+
     redraw_mask &= ~REDRAW_MAIN;
   }
 
   if (redraw_mask & REDRAW_DOORS)
   {
-#ifdef MSDOS
-    wait_for_vsync = TRUE;
-#endif
     if (redraw_mask & REDRAW_DOOR_1)
-      XCopyArea(display,backbuffer,window,gc,
-               DX,DY, DXSIZE,DYSIZE,
-               DX,DY);
+      BlitBitmap(backbuffer, window, DX, DY, DXSIZE, DYSIZE, DX, DY);
     if (redraw_mask & REDRAW_DOOR_2)
     {
       if ((redraw_mask & REDRAW_DOOR_2) == REDRAW_DOOR_2)
-       XCopyArea(display,backbuffer,window,gc,
-                 VX,VY, VXSIZE,VYSIZE,
-                 VX,VY);
+       BlitBitmap(backbuffer, window, VX,VY, VXSIZE,VYSIZE, VX,VY);
       else
       {
        if (redraw_mask & REDRAW_VIDEO_1)
-         XCopyArea(display,backbuffer,window,gc,
-                   VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS,
-                   VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE,
-                   VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS);
+         BlitBitmap(backbuffer, window,
+                    VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS,
+                    VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE,
+                    VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS);
        if (redraw_mask & REDRAW_VIDEO_2)
-         XCopyArea(display,backbuffer,window,gc,
-                   VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS,
-                   VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE,
-                   VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS);
+         BlitBitmap(backbuffer, window,
+                    VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS,
+                    VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE,
+                    VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS);
        if (redraw_mask & REDRAW_VIDEO_3)
-         XCopyArea(display,backbuffer,window,gc,
-                   VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS,
-                   VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE,
-                   VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
+         BlitBitmap(backbuffer, window,
+                    VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS,
+                    VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE,
+                    VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
       }
     }
+    if (redraw_mask & REDRAW_DOOR_3)
+      BlitBitmap(backbuffer, window, EX, EY, EXSIZE, EYSIZE, EX, EY);
     redraw_mask &= ~REDRAW_DOORS;
   }
 
-  if (redraw_mask & REDRAW_MICROLEV)
+  if (redraw_mask & REDRAW_MICROLEVEL)
   {
-    XCopyArea(display,backbuffer,window,gc,
-             MICROLEV_XPOS,MICROLEV_YPOS, MICROLEV_XSIZE,MICROLEV_YSIZE,
-             MICROLEV_XPOS,MICROLEV_YPOS);
-    XCopyArea(display,backbuffer,window,gc,
-             SX,MICROLABEL_YPOS, SXSIZE,FONT4_YSIZE,
-             SX,MICROLABEL_YPOS);
-    redraw_mask &= ~REDRAW_MICROLEV;
+    BlitBitmap(backbuffer, window,
+              MICROLEV_XPOS, MICROLEV_YPOS, MICROLEV_XSIZE, MICROLEV_YSIZE,
+              MICROLEV_XPOS, MICROLEV_YPOS);
+    BlitBitmap(backbuffer, window,
+              SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE,
+              SX, MICROLABEL_YPOS);
+    redraw_mask &= ~REDRAW_MICROLEVEL;
   }
 
   if (redraw_mask & REDRAW_TILES)
@@ -174,563 +264,781 @@ void BackToFront()
     for(x=0; x<SCR_FIELDX; x++)
       for(y=0; y<SCR_FIELDY; y++)
        if (redraw[redraw_x1 + x][redraw_y1 + y])
-         XCopyArea(display,buffer,window,gc,
-                   FX+x*TILEX,FX+y*TILEY, TILEX,TILEY,
-                   SX+x*TILEX,SY+y*TILEY);
+         BlitBitmap(buffer, window,
+                    FX + x * TILEX, FX + y * TILEY, TILEX, TILEY,
+                    SX + x * TILEX, SY + y * TILEY);
+  }
+
+  if (redraw_mask & REDRAW_FPS)                /* display frames per second */
+  {
+    char text[100];
+    char info1[100];
+
+    sprintf(info1, " (only every %d. frame)", global.fps_slowdown_factor);
+    if (!global.fps_slowdown)
+      info1[0] = '\0';
+
+    sprintf(text, "%.1f fps%s", global.frames_per_second, info1);
+    DrawTextExt(window, SX, SY, text, FS_SMALL, FC_YELLOW, FONT_OPAQUE);
   }
 
-  XFlush(display);
+  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 = 0;
+  redraw_mask = REDRAW_NONE;
 }
 
 void FadeToFront()
 {
-/*
-  long fading_delay = 300000;
+#if 0
+  long fading_delay = 300;
 
-  if (fading_on && (redraw_mask & REDRAW_FIELD))
+  if (setup.fading && (redraw_mask & REDRAW_FIELD))
   {
-*/
+#endif
 
-/*
+#if 0
     int x,y;
 
-    XFillRectangle(display,window,gc,
-                  REAL_SX,REAL_SY,FULL_SXSIZE,FULL_SYSIZE);
-    XFlush(display);
+    ClearRectangle(window, REAL_SX,REAL_SY,FULL_SXSIZE,FULL_SYSIZE);
+    FlushDisplay();
 
     for(i=0;i<2*FULL_SYSIZE;i++)
     {
       for(y=0;y<FULL_SYSIZE;y++)
       {
-       XCopyArea(display,backbuffer,window,gc,
-                 REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i);
+       BlitBitmap(backbuffer, window,
+                  REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i);
       }
-      XFlush(display);
-      Delay(10000);
+      FlushDisplay();
+      Delay(10);
     }
-*/
+#endif
 
-/*
+#if 0
     for(i=1;i<FULL_SYSIZE;i+=2)
-      XCopyArea(display,backbuffer,window,gc,
-               REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i);
-    XFlush(display);
+      BlitBitmap(backbuffer, window,
+                REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i);
+    FlushDisplay();
     Delay(fading_delay);
-*/
+#endif
 
-/*
-    XSetClipOrigin(display,clip_gc[PIX_FADEMASK],0,0);
-    XCopyArea(display,backbuffer,window,clip_gc[PIX_FADEMASK],
-             REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, REAL_SX,REAL_SY);
-    XFlush(display);
+#if 0
+    SetClipOrigin(clip_gc[PIX_FADEMASK], 0, 0);
+    BlitBitmapMasked(backbuffer, window,
+                    REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
+                    REAL_SX,REAL_SY);
+    FlushDisplay();
     Delay(fading_delay);
 
-    XSetClipOrigin(display,clip_gc[PIX_FADEMASK],-1,-1);
-    XCopyArea(display,backbuffer,window,clip_gc[PIX_FADEMASK],
-             REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, REAL_SX,REAL_SY);
-    XFlush(display);
+    SetClipOrigin(clip_gc[PIX_FADEMASK], -1, -1);
+    BlitBitmapMasked(backbuffer, window,
+                    REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
+                    REAL_SX,REAL_SY);
+    FlushDisplay();
     Delay(fading_delay);
 
-    XSetClipOrigin(display,clip_gc[PIX_FADEMASK],0,-1);
-    XCopyArea(display,backbuffer,window,clip_gc[PIX_FADEMASK],
-             REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, REAL_SX,REAL_SY);
-    XFlush(display);
+    SetClipOrigin(clip_gc[PIX_FADEMASK], 0, -1);
+    BlitBitmapMasked(backbuffer, window,
+                    REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
+                    REAL_SX,REAL_SY);
+    FlushDisplay();
     Delay(fading_delay);
 
-    XSetClipOrigin(display,clip_gc[PIX_FADEMASK],-1,0);
-    XCopyArea(display,backbuffer,window,clip_gc[PIX_FADEMASK],
-             REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, REAL_SX,REAL_SY);
-    XFlush(display);
+    SetClipOrigin(clip_gc[PIX_FADEMASK], -1, 0);
+    BlitBitmapMasked(backbuffer, window,
+                    REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
+                    REAL_SX,REAL_SY);
+    FlushDisplay();
     Delay(fading_delay);
 
     redraw_mask &= ~REDRAW_MAIN;
   }
-*/
+#endif
 
   BackToFront();
 }
 
+void SetMainBackgroundImage(int graphic)
+{
+  SetMainBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
+                         graphic_info[graphic].bitmap ?
+                         graphic_info[graphic].bitmap :
+                         graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
+}
+
+void SetDoorBackgroundImage(int graphic)
+{
+  SetDoorBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
+                         graphic_info[graphic].bitmap ?
+                         graphic_info[graphic].bitmap :
+                         graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
+}
+
+void DrawBackground(int dest_x, int dest_y, int width, int height)
+{
+  ClearRectangleOnBackground(backbuffer, dest_x, dest_y, width, height);
+
+  redraw_mask |= REDRAW_FIELD;
+}
+
 void ClearWindow()
 {
-  XFillRectangle(display,backbuffer,gc,
-                REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
+  DrawBackground(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
 
-  if (soft_scrolling_on && game_status==PLAYING)
+  if (setup.soft_scrolling && game_status == PLAYING)
   {
-    XFillRectangle(display,fieldbuffer,gc,
-                  0,0, FXSIZE,FYSIZE);
+    ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE);
     SetDrawtoField(DRAW_BUFFERED);
   }
   else
     SetDrawtoField(DRAW_BACKBUFFER);
 
-  if (direct_draw_on && game_status==PLAYING)
+  if (setup.direct_draw && game_status == PLAYING)
   {
-    XFillRectangle(display,window,gc,
-                  REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE);
+    ClearRectangle(window, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
     SetDrawtoField(DRAW_DIRECT);
   }
-
-  redraw_mask |= REDRAW_FIELD;
 }
 
-void DrawText(int x, int y, char *text, int font, int col)
+void MarkTileDirty(int x, int y)
 {
-  DrawTextExt(drawto, gc, x, y, text, font, col);
-  if (x < DX)
-    redraw_mask |= REDRAW_FIELD;
-  else if (y < VY)
-    redraw_mask |= REDRAW_DOOR_1;
+  int xx = redraw_x1 + x;
+  int yy = redraw_y1 + y;
+
+  if (!redraw[xx][yy])
+    redraw_tiles++;
+
+  redraw[xx][yy] = TRUE;
+  redraw_mask |= REDRAW_TILES;
 }
 
-void DrawTextExt(Drawable d, GC gc, int x, int y,
-                char *text, int font, int font_color)
+void SetBorderElement()
 {
-  int font_width, font_height, font_start;
-  int font_pixmap;
-
-  if (font!=FS_SMALL && font!=FS_BIG)
-    font = FS_SMALL;
-  if (font_color<FC_RED || font_color>FC_SPECIAL2)
-    font_color = FC_RED;
+  int x, y;
 
-  font_width =
-    (font==FS_BIG ? FONT1_XSIZE :
-     font_color<FC_SPECIAL1 ? FONT2_XSIZE :
-     font_color<FC_SPECIAL2 ? FONT3_XSIZE : FONT4_XSIZE);
-  font_height =
-    (font==FS_BIG ? FONT1_XSIZE :
-     font_color<FC_SPECIAL2 ? FONT2_XSIZE: FONT4_XSIZE);
-  font_pixmap = (font==FS_BIG ? PIX_BIGFONT : PIX_SMALLFONT);
-  font_start =
-    font_color*(font==FS_BIG ? FONT1_YSIZE : FONT2_YSIZE)*FONT_LINES_PER_FONT;
+  BorderElement = EL_EMPTY;
 
-  while(*text)
+  for(y=0; y<lev_fieldy && BorderElement == EL_EMPTY; y++)
   {
-    char c = *text++;
+    for(x=0; x<lev_fieldx; x++)
+    {
+      if (!IS_MASSIVE(Feld[x][y]))
+       BorderElement = EL_STEELWALL;
 
-    if (c>='a' && c<='z')
-      c = 'A' + (c - 'a');
-    else if (c=='ä' || c=='Ä')
-      c = 91;
-    else if (c=='ö' || c=='Ö')
-      c = 92;
-    else if (c=='ü' || c=='Ü')
-      c = 93;
+      if (y != 0 && y != lev_fieldy - 1 && x != lev_fieldx - 1)
+       x = lev_fieldx - 2;
+    }
+  }
+}
 
-    if (c>=32 && c<=95)
-      XCopyArea(display,pix[font_pixmap],d,gc,
-               ((c-32) % FONT_CHARS_PER_LINE)*font_width,
-               ((c-32) / FONT_CHARS_PER_LINE)*font_height + font_start,
-               font_width,font_height, x,y);
+void SetRandomAnimationValue(int x, int y)
+{
+  anim.random_frame = GfxRandom[x][y];
+}
 
-    x += font_width;
-  }
+inline 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)
+    sync_frame = FrameCounter;
+
+  return getAnimationFrame(graphic_info[graphic].anim_frames,
+                          graphic_info[graphic].anim_delay,
+                          graphic_info[graphic].anim_mode,
+                          graphic_info[graphic].anim_start_frame,
+                          sync_frame);
 }
 
-void DrawPlayerField()
+inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
+                                   int graphic, int sync_frame, int mask_mode)
 {
-  int x = JX, y = JY;
-  int sx = SCROLLX(x), sy = SCROLLY(y);
+  int frame = getGraphicAnimationFrame(graphic, sync_frame);
 
-  int sxx = 0, syy = 0;
+  if (mask_mode == USE_MASKING)
+    DrawGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame);
+  else
+    DrawGraphicExt(dst_bitmap, x, y, graphic, frame);
+}
 
-  int element = Feld[x][y];
-  int graphic, phase;
-  BOOL draw_thru_mask = FALSE;
+inline void DrawGraphicAnimation(int x, int y, int graphic)
+{
+  int lx = LEVELX(x), ly = LEVELY(y);
 
-  if (PlayerGone)
+  if (!IN_SCR_FIELD(x, y))
     return;
 
-#if DEBUG
-  if (!IN_LEV_FIELD(x,y) || !IN_SCR_FIELD(sx,sy))
-  {
-    printf("DrawPlayerField(): x = %d, y = %d\n",x,y);
-    printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy);
-    printf("DrawPlayerField(): This should never happen!\n");
-    return;
-  }
-#endif
+  DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
+                         graphic, GfxFrame[lx][ly], NO_MASKING);
+  MarkTileDirty(x, y);
+}
 
-  if (element == EL_EXPLODING)
-    return;
+void DrawLevelGraphicAnimation(int x, int y, int graphic)
+{
+  DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+}
 
-  if (direct_draw_on)
-    SetDrawtoField(DRAW_BUFFERED);
+void DrawLevelElementAnimation(int x, int y, int element)
+{
+  DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
+}
 
-  /* draw things behind the player (EL_PFORTE* || mole/penguin/pig/dragon) */
+inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
+{
+  int sx = SCREENX(x), sy = SCREENY(y);
 
+  if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy))
+    return;
 
+  if (!IS_NEW_FRAME(GfxFrame[x][y], graphic))
+    return;
 
+  DrawGraphicAnimation(sx, sy, graphic);
+}
 
-  DrawLevelField(x,y);
+void DrawLevelElementAnimationIfNeeded(int x, int y, int element)
+{
+  int sx = SCREENX(x), sy = SCREENY(y);
+  int graphic;
 
+  if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy))
+    return;
 
+  graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
 
-  if (Store[x][y])
-  {
-    DrawGraphic(sx,sy, el2gfx(Store[x][y]));
-    draw_thru_mask = TRUE;
-  }
-  else if (element!=EL_DYNAMIT && element!=EL_DYNABOMB)
-  {
-    DrawLevelField(x,y);
-    draw_thru_mask = TRUE;
-  }
+  if (!IS_NEW_FRAME(GfxFrame[x][y], graphic))
+    return;
 
-  /*
-  else if (element!=EL_LEERRAUM && element!=EL_DYNAMIT && element!=EL_DYNABOMB)
-  {
-    DrawLevelField(x,y);
-    draw_thru_mask = TRUE;
-  }
-  */
+  DrawGraphicAnimation(sx, sy, graphic);
+}
 
+void DrawAllPlayers()
+{
+  int i;
 
-  draw_thru_mask = TRUE;
+  for(i=0; i<MAX_PLAYERS; i++)
+    if (stored_player[i].active)
+      DrawPlayer(&stored_player[i]);
+}
 
+void DrawPlayerField(int x, int y)
+{
+  if (!IS_PLAYER(x, y))
+    return;
 
+  DrawPlayer(PLAYERINFO(x, y));
+}
 
+void DrawPlayer(struct PlayerInfo *player)
+{
+  int jx = player->jx, jy = player->jy;
+  int last_jx = player->last_jx, last_jy = player->last_jy;
+  int next_jx = jx + (jx - last_jx), next_jy = jy + (jy - last_jy);
+  int sx = SCREENX(jx), sy = SCREENY(jy);
+  int sxx = 0, syy = 0;
+  int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy];
+  int graphic;
+  int frame = 0;
+  boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE);
 
-  /* draw player himself */
+  if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
+    return;
 
-  if (PlayerMovDir==MV_LEFT)
-    graphic = (PlayerPushing ? GFX_SPIELER_PUSH_LEFT : GFX_SPIELER_LEFT);
-  else if (PlayerMovDir==MV_RIGHT)
-    graphic = (PlayerPushing ? GFX_SPIELER_PUSH_RIGHT : GFX_SPIELER_RIGHT);
-  else if (PlayerMovDir==MV_UP)
-    graphic = GFX_SPIELER_UP;
-  else /* MV_DOWN || MV_NO_MOVING */
-    graphic = GFX_SPIELER_DOWN;
+#if DEBUG
+  if (!IN_LEV_FIELD(jx,jy))
+  {
+    printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy);
+    printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy);
+    printf("DrawPlayerField(): This should never happen!\n");
+    return;
+  }
+#endif
 
-  graphic += PlayerFrame;
+  if (element == EL_EXPLOSION)
+    return;
 
+  /* draw things in the field the player is leaving, if needed */
 
-  if (PlayerGfxPos)
+  if (player_is_moving)
   {
-    if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT)
-      sxx = PlayerGfxPos;
+    if (Store[last_jx][last_jy] && IS_DRAWABLE(last_element))
+    {
+      DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]);
+
+      if (last_element == EL_DYNAMITE_ACTIVE)
+       DrawDynamite(last_jx, last_jy);
+      else
+       DrawLevelFieldThruMask(last_jx, last_jy);
+    }
+    else if (last_element == EL_DYNAMITE_ACTIVE)
+      DrawDynamite(last_jx, last_jy);
     else
-      syy = PlayerGfxPos;
+      DrawLevelField(last_jx, last_jy);
+
+    if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy)))
+    {
+      if (player->GfxPos)
+      {
+       if (Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
+         DrawLevelElement(next_jx, next_jy, EL_SOKOBAN_FIELD_EMPTY);
+       else
+         DrawLevelElement(next_jx, next_jy, EL_EMPTY);
+      }
+      else
+       DrawLevelField(next_jx, next_jy);
+    }
   }
 
+  if (!IN_SCR_FIELD(sx, sy))
+    return;
 
-  if (!soft_scrolling_on && ScreenMovPos)
-    sxx = syy = 0;
+  if (setup.direct_draw)
+    SetDrawtoField(DRAW_BUFFERED);
+
+  /* draw things behind the player, if needed */
+
+  if (Store[jx][jy])
+    DrawLevelElement(jx, jy, Store[jx][jy]);
+  else if (!IS_ACTIVE_BOMB(element))
+    DrawLevelField(jx, jy);
+  else
+    DrawLevelElement(jx, jy, EL_EMPTY);
 
+  /* draw player himself */
 
+  if (game.emulation == EMU_SUPAPLEX)
+  {
+    static int last_dir = MV_LEFT;
+    int action = (player->programmed_action ? player->programmed_action :
+                 player->action);
+    boolean action_moving =
+      (player_is_moving ||
+       ((action & (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)) &&
+       !(action & ~(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN))));
 
+    graphic = IMG_SP_MURPHY;
 
+    if (player->Pushing)
+    {
+      if (player->MovDir == MV_LEFT)
+       graphic = IMG_SP_MURPHY_PUSHING_LEFT;
+      else if (player->MovDir == MV_RIGHT)
+       graphic = IMG_SP_MURPHY_PUSHING_RIGHT;
+      else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
+       graphic = IMG_SP_MURPHY_PUSHING_LEFT;
+      else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
+       graphic = IMG_SP_MURPHY_PUSHING_RIGHT;
+    }
+    else if (player->snapped)
+    {
+      if (player->MovDir == MV_LEFT)
+       graphic = IMG_SP_MURPHY_SNAPPING_LEFT;
+      else if (player->MovDir == MV_RIGHT)
+       graphic = IMG_SP_MURPHY_SNAPPING_RIGHT;
+      else if (player->MovDir == MV_UP)
+       graphic = IMG_SP_MURPHY_SNAPPING_UP;
+      else if (player->MovDir == MV_DOWN)
+       graphic = IMG_SP_MURPHY_SNAPPING_DOWN;
+    }
+    else if (action_moving)
+    {
+      if (player->MovDir == MV_LEFT)
+       graphic = IMG_SP_MURPHY_MOVING_LEFT;
+      else if (player->MovDir == MV_RIGHT)
+       graphic = IMG_SP_MURPHY_MOVING_RIGHT;
+      else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
+       graphic = IMG_SP_MURPHY_MOVING_LEFT;
+      else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
+       graphic = IMG_SP_MURPHY_MOVING_RIGHT;
+      else
+       graphic = IMG_SP_MURPHY_MOVING_LEFT;
 
+      frame = getGraphicAnimationFrame(graphic, -1);
+    }
 
-  if (draw_thru_mask)
-    DrawGraphicShiftedThruMask(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING);
-    /*
-    DrawGraphicThruMask(sx, sy, graphic);
-    */
+    if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
+      last_dir = player->MovDir;
+  }
   else
-    DrawGraphicShifted(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING);
-  /*
-    DrawGraphic(sx, sy, graphic);
-    */
+  {
+    if (player->MovDir == MV_LEFT)
+      graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_LEFT :
+                player->is_moving ? IMG_PLAYER1_MOVING_LEFT :
+                IMG_PLAYER1_LEFT);
+    else if (player->MovDir == MV_RIGHT)
+      graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_RIGHT :
+                player->is_moving ? IMG_PLAYER1_MOVING_RIGHT :
+                IMG_PLAYER1_RIGHT);
+    else if (player->MovDir == MV_UP)
+      graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_UP :
+                player->is_moving ? IMG_PLAYER1_MOVING_UP :
+                IMG_PLAYER1_UP);
+    else       /* MV_DOWN || MV_NO_MOVING */
+      graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_DOWN :
+                player->is_moving ? IMG_PLAYER1_MOVING_DOWN :
+                IMG_PLAYER1_DOWN);
+
+    graphic = PLAYER_NR_GFX(graphic, player->index_nr);
 
+#if 0
+    frame = player->Frame;
+#else
+    frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
+  }
 
+  if (player->GfxPos)
+  {
+    if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
+      sxx = player->GfxPos;
+    else
+      syy = player->GfxPos;
+  }
 
-  MarkTileDirty(sx,sy);
+  if (!setup.soft_scrolling && ScreenMovPos)
+    sxx = syy = 0;
 
+#if 0
+  if (player->Frame)
+    printf("-> %d\n", player->Frame);
+#endif
 
+  DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
 
-  if (PlayerPushing && PlayerGfxPos)
+  if (SHIELD_ON(player))
   {
-    int nextJX = JX + (JX - lastJX);
-    int nextJY = JY + (JY - lastJY);
-    int px = SCROLLX(nextJX), py = SCROLLY(nextJY);
+    int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE :
+                  IMG_SHIELD_NORMAL_ACTIVE);
+    int frame = getGraphicAnimationFrame(graphic, -1);
 
-    if (Feld[JX][JY] == EL_SOKOBAN_FELD_LEER ||
-       Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
-      DrawGraphicShiftedThruMask(px,py,sxx,syy,
-                                GFX_SOKOBAN_OBJEKT,
-                                CUT_NO_CUTTING);
+    DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
+  }
+
+#if 0
+  if (player->Pushing && player->GfxPos)
+#else
+  if (player->Pushing && player_is_moving)
+#endif
+  {
+    int px = SCREENX(next_jx), py = SCREENY(next_jy);
+
+    if ((sxx || syy) &&
+       (element == EL_SOKOBAN_FIELD_EMPTY ||
+        Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL))
+      DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0,
+                                NO_CUTTING);
     else
     {
-      int element = Feld[nextJX][nextJY];
-      int graphic = el2gfx(element);
+      int element = Feld[next_jx][next_jy];
+      int graphic = el2img(element);
+#if 1
+      int frame = 0;
+#endif
 
-      if (element == EL_FELSBROCKEN && sxx)
+      if ((sxx || syy) && IS_PUSHABLE(element))
       {
-       int phase = (PlayerGfxPos / (TILEX/4));
+       graphic = el_act_dir2img(element, ACTION_MOVING, player->MovDir);
+#if 1
+       frame = getGraphicAnimationFrame(graphic, player->GfxPos);
 
-       if (PlayerMovDir == MV_LEFT)
-         graphic += phase;
-       else
-         graphic += (phase+4)%4;
+       frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
 
+#if 0
+       printf("-> %d [%d]\n", player->Frame, player->GfxPos);
+#endif
 
-       /*
-       printf("----> (%d, %d, %d)\n",
-              PlayerGfxPos, phase, graphic);
-              */
+#if 0
+       /* !!! FIX !!! */
+       if (player->MovDir == MV_LEFT)
+         frame = 3 - frame;
+#endif
 
+#if 0
+       frame = (player->GfxPos / (TILEX / 4));
+
+       if (player->MovDir == MV_RIGHT)
+         frame = (frame + 4) % 4;
+#endif
       }
 
-      DrawGraphicShifted(px,py, sxx,syy, graphic, CUT_NO_CUTTING);
+      DrawGraphicShifted(px, py, sxx, syy, graphic, frame,
+                        NO_CUTTING, NO_MASKING);
     }
   }
 
+  /* draw things in front of player (active dynamite or dynabombs) */
 
-
-  /* draw things in front of player (EL_DYNAMIT || EL_DYNABOMB) */
-
-  if (element == EL_DYNAMIT || element == EL_DYNABOMB)
+  if (IS_ACTIVE_BOMB(element))
   {
-    graphic = el2gfx(element);
+    graphic = el2img(element);
 
-    if (element == EL_DYNAMIT)
+#if 0
+    if (element == EL_DYNAMITE_ACTIVE)
     {
-      if ((phase = (96-MovDelay[x][y])/12) > 6)
-       phase = 6;
+      if ((frame = (96 - MovDelay[jx][jy]) / 12) > 6)
+       frame = 6;
     }
     else
     {
-      if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3)
-       phase = 7-phase;
+      if ((frame = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3)
+       frame = 7 - frame;
     }
+#else
 
-    DrawGraphicThruMask(sx,sy, graphic + phase);
+#if 0
+    frame = getGraphicAnimationFrame(graphic, 96 - MovDelay[jx][jy]);
+#else
+    frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]);
+#endif
+
+#endif
+
+    if (game.emulation == EMU_SUPAPLEX)
+      DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame);
+    else
+      DrawGraphicThruMask(sx, sy, graphic, frame);
   }
 
-  if (direct_draw_on)
+  if (player_is_moving && last_element == EL_EXPLOSION)
   {
-    int dest_x = SX+SCROLLX(x)*TILEX;
-    int dest_y = SY+SCROLLY(y)*TILEY;
-    int x_size = TILEX;
-    int y_size = TILEY;
+    int stored = Store[last_jx][last_jy];
+    int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION :
+                  stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON :
+                  IMG_SP_EXPLOSION);
+    int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
+    int phase = ExplodePhase[last_jx][last_jy] - 1;
+    int frame = getGraphicAnimationFrame(graphic, phase - delay);
 
-    if (!ScreenMovPos)
-    {
-      dest_x = SX + SCROLLX(MIN(JX,lastJX))*TILEX;
-      dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY;
-      x_size = TILEX * (1 + ABS(JX - lastJX));
-      y_size = TILEY * (1 + ABS(JY - lastJY));
-    }
-
-    XCopyArea(display,drawto_field,window,gc,
-             dest_x,dest_y, x_size,y_size, dest_x,dest_y);
-    SetDrawtoField(DRAW_DIRECT);
+    if (phase >= delay)
+      DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame);
   }
-}
 
-static int getGraphicAnimationPhase(int frames, int delay, int mode)
-{
-  int phase;
+  /* draw elements that stay over the player */
+  /* handle the field the player is leaving ... */
+  if (player_is_moving && IS_OVER_PLAYER(last_element))
+    DrawLevelField(last_jx, last_jy);
+
+  /* ... and the field the player is entering */
+  if (IS_OVER_PLAYER(element))
+    DrawLevelField(jx, jy);
 
-  if (mode == ANIM_OSCILLATE)
+  if (setup.direct_draw)
   {
-    int max_anim_frames = frames*2 - 2;
-    phase = (FrameCounter % (delay * max_anim_frames)) / delay;
-    phase = (phase < frames ? phase : max_anim_frames - phase);
-  }
-  else
-    phase = (FrameCounter % (delay * frames)) / delay;
+    int dest_x = SX + SCREENX(MIN(jx, last_jx)) * TILEX;
+    int dest_y = SY + SCREENY(MIN(jy, last_jy)) * TILEY;
+    int x_size = TILEX * (1 + ABS(jx - last_jx));
+    int y_size = TILEY * (1 + ABS(jy - last_jy));
 
-  if (mode == ANIM_REVERSE)
-    phase = -phase;
+    BlitBitmap(drawto_field, window,
+              dest_x, dest_y, x_size, y_size, dest_x, dest_y);
+    SetDrawtoField(DRAW_DIRECT);
+  }
 
-  return(phase);
+  MarkTileDirty(sx,sy);
 }
 
-void DrawGraphicAnimation(int x, int y, int graphic,
-                         int frames, int delay, int mode)
+void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y)
 {
-  int phase = getGraphicAnimationPhase(frames, delay, mode);
-
-  if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-    DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase);
+  Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+  int offset_x = graphic_info[graphic].offset_x;
+  int offset_y = graphic_info[graphic].offset_y;
+  int src_x = graphic_info[graphic].src_x + frame * offset_x;
+  int src_y = graphic_info[graphic].src_y + frame * offset_y;
+
+  *bitmap = src_bitmap;
+  *x = src_x;
+  *y = src_y;
 }
 
-void DrawGraphic(int x, int y, int graphic)
+void DrawGraphic(int x, int y, int graphic, int frame)
 {
-
 #if DEBUG
-  if (!IN_SCR_FIELD(x,y))
+  if (!IN_SCR_FIELD(x, y))
   {
-    printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
+    printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic);
     printf("DrawGraphic(): This should never happen!\n");
     return;
   }
 #endif
 
-  DrawGraphicExt(drawto_field, gc, x, y, graphic);
-  MarkTileDirty(x,y);
+  DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame);
+  MarkTileDirty(x, y);
 }
 
-void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
+#if 0
+void DrawOldGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic)
 {
-  DrawGraphicExtHiRes(d, gc, FX+x*TILEX, FY+y*TILEY, graphic);
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+
+  getOldGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+  BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
 }
+#endif
 
-void DrawGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic)
+void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
+                   int frame)
 {
-  if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
-  {
-    graphic -= GFX_START_ROCKSSCREEN;
-    XCopyArea(display,pix[PIX_BACK],d,gc,
-             SX+(graphic % GFX_PER_LINE)*TILEX,
-             SY+(graphic / GFX_PER_LINE)*TILEY,
-             TILEX,TILEY, x,y);
-  }
-  else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
-  {
-    graphic -= GFX_START_ROCKSHEROES;
-    XCopyArea(display,pix[PIX_HEROES],d,gc,
-             (graphic % HEROES_PER_LINE)*TILEX,
-             (graphic / HEROES_PER_LINE)*TILEY,
-             TILEX,TILEY, x,y);
-  }
-  else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
-  {
-    graphic -= GFX_START_ROCKSFONT;
-    XCopyArea(display,pix[PIX_BIGFONT],d,gc,
-             (graphic % FONT_CHARS_PER_LINE)*TILEX,
-             (graphic / FONT_CHARS_PER_LINE)*TILEY +
-             FC_SPECIAL1*TILEY*FONT_LINES_PER_FONT,
-             TILEX,TILEY, x,y);
-  }
-  else
-    XFillRectangle(display,d,gc, x,y, TILEX,TILEY);
+#if 1
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+
+  getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+#else
+  Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+  int src_x = graphic_info[graphic].src_x;
+  int src_y = graphic_info[graphic].src_y;
+  int offset_x = graphic_info[graphic].offset_x;
+  int offset_y = graphic_info[graphic].offset_y;
+
+  src_x += frame * offset_x;
+  src_y += frame * offset_y;
+#endif
+
+  BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
 }
 
-void DrawGraphicThruMask(int x, int y, int graphic)
+void DrawGraphicThruMask(int x, int y, int graphic, int frame)
 {
-  int src_x,src_y, dest_x,dest_y;
-
 #if DEBUG
-  if (!IN_SCR_FIELD(x,y))
+  if (!IN_SCR_FIELD(x, y))
   {
-    printf("DrawGraphicThruMask(): x = %d, y = %d\n",x,y);
+    printf("DrawGraphicThruMask(): x = %d,y = %d, graphic = %d\n",x,y,graphic);
     printf("DrawGraphicThruMask(): This should never happen!\n");
     return;
   }
 #endif
 
-  if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
-  {
-    graphic -= GFX_START_ROCKSSCREEN;
-    src_x  = SX+(graphic % GFX_PER_LINE)*TILEX;
-    src_y  = SY+(graphic / GFX_PER_LINE)*TILEY;
-    dest_x = FX+x*TILEX;
-    dest_y = FY+y*TILEY;
-
-    XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
-    XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
-             src_x,src_y, TILEX,TILEY, dest_x,dest_y);
-  }
-  else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
-  {
-    graphic -= GFX_START_ROCKSHEROES;
-    src_x  = (graphic % HEROES_PER_LINE)*TILEX;
-    src_y  = (graphic / HEROES_PER_LINE)*TILEY;
-    dest_x = FX+x*TILEX;
-    dest_y = FY+y*TILEY;
-
-    XSetClipOrigin(display,clip_gc[PIX_HEROES],dest_x-src_x,dest_y-src_y);
-    XCopyArea(display,pix[PIX_HEROES],drawto_field,clip_gc[PIX_HEROES],
-             src_x,src_y, TILEX,TILEY, dest_x,dest_y);
-  }
-  else
-  {
-    DrawGraphic(x,y,graphic);
-    return;
-  }
-
-  MarkTileDirty(x,y);
+  DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic,
+                        frame);
+  MarkTileDirty(x, y);
 }
 
-void DrawElementThruMask(int x, int y, int element)
+void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic,
+                           int frame)
 {
-  DrawGraphicThruMask(x,y,el2gfx(element));
+#if 1
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  GC drawing_gc;
+
+  getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+  drawing_gc = src_bitmap->stored_clip_gc;
+#else
+  GC drawing_gc = src_bitmap->stored_clip_gc;
+  Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+  int src_x = graphic_info[graphic].src_x;
+  int src_y = graphic_info[graphic].src_y;
+  int offset_x = graphic_info[graphic].offset_x;
+  int offset_y = graphic_info[graphic].offset_y;
+
+  src_x += frame * offset_x;
+  src_y += frame * offset_y;
+
+#endif
+
+  SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
+  BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dest_x, dest_y);
 }
 
 void DrawMiniGraphic(int x, int y, int graphic)
 {
-  DrawMiniGraphicExt(drawto, gc, x, y, graphic);
-  MarkTileDirty(x/2, y/2);
+  DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic);
+  MarkTileDirty(x / 2, y / 2);
 }
 
-void DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
+void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
-  DrawMiniGraphicExtHiRes(d,gc, SX+x*MINI_TILEX,SY+y*MINI_TILEY, graphic);
-}
+  Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+  int mini_startx = 0;
+  int mini_starty = src_bitmap->height * 2 / 3;
+  int src_x = mini_startx + graphic_info[graphic].src_x / 2;
+  int src_y = mini_starty + graphic_info[graphic].src_y / 2;
 
-void DrawMiniGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic)
-{
-  if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
-  {
-    graphic -= GFX_START_ROCKSSCREEN;
-    XCopyArea(display,pix[PIX_BACK],d,gc,
-             MINI_GFX_STARTX+(graphic % MINI_GFX_PER_LINE)*MINI_TILEX,
-             MINI_GFX_STARTY+(graphic / MINI_GFX_PER_LINE)*MINI_TILEY,
-             MINI_TILEX,MINI_TILEY, x,y);
-  }
-  else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
+#if 0
+  /* !!! not needed anymore, because of automatically created mini graphics */
+  if (src_x + MINI_TILEX > src_bitmap->width ||
+      src_y + MINI_TILEY > src_bitmap->height)
   {
-    graphic -= GFX_START_ROCKSFONT;
-    XCopyArea(display,pix[PIX_SMALLFONT],d,gc,
-             (graphic % FONT_CHARS_PER_LINE)*FONT4_XSIZE,
-             (graphic / FONT_CHARS_PER_LINE)*FONT4_YSIZE +
-             FC_SPECIAL2*FONT2_YSIZE*FONT_LINES_PER_FONT,
-             MINI_TILEX,MINI_TILEY, x,y);
+    /* graphic of desired size seems not to be contained in this image;
+       dirty workaround: get it from the middle of the normal sized image */
+
+    printf("::: using dirty workaround for %d (%d, %d)\n",
+          graphic, src_bitmap->width, src_bitmap->height);
+
+    getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
+    src_x += (TILEX / 2 - MINI_TILEX / 2);
+    src_y += (TILEY / 2 - MINI_TILEY / 2);
   }
-  else
-    XFillRectangle(display,d,gc, x,y, MINI_TILEX,MINI_TILEY);
+#endif
+
+  *bitmap = src_bitmap;
+  *x = src_x;
+  *y = src_y;
 }
 
-void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
+void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
 {
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+
+  getMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+  BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
+}
+
+void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
+                       int cut_mode, int mask_mode)
+{
+  Bitmap *src_bitmap;
+  GC drawing_gc;
+  int src_x;
+  int src_y;
+  int offset_x;
+  int offset_y;
+
   int width = TILEX, height = TILEY;
   int cx = 0, cy = 0;
+  int dest_x, dest_y;
 
   if (graphic < 0)
   {
-    DrawGraphic(x,y,graphic);
+    DrawGraphic(x, y, graphic, frame);
     return;
   }
 
-  if (dx || dy)                        /* Verschiebung der Grafik? */
+  if (dx || dy)                        /* shifted graphic */
   {
-    if (x < BX1)               /* Element kommt von links ins Bild */
+    if (x < BX1)               /* object enters playfield from the left */
     {
       x = BX1;
       width = dx;
       cx = TILEX - dx;
       dx = 0;
     }
-    else if (x > BX2)          /* Element kommt von rechts ins Bild */
+    else if (x > BX2)          /* object enters playfield from the right */
     {
       x = BX2;
       width = -dx;
       dx = TILEX + dx;
     }
-    else if (x==BX1 && dx<0)   /* Element verläßt links das Bild */
+    else if (x==BX1 && dx < 0) /* object leaves playfield to the left */
     {
       width += dx;
       cx = -dx;
       dx = 0;
     }
-    else if (x==BX2 && dx>0)   /* Element verläßt rechts das Bild */
+    else if (x==BX2 && dx > 0) /* object leaves playfield to the right */
       width -= dx;
-    else if (dx)               /* allg. Bewegung in x-Richtung */
+    else if (dx)               /* general horizontal movement */
       MarkTileDirty(x + SIGN(dx), y);
 
-    if (y < BY1)               /* Element kommt von oben ins Bild */
+    if (y < BY1)               /* object enters playfield from the top */
     {
-      if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */
+      if (cut_mode==CUT_BELOW) /* object completely above top border */
        return;
 
       y = BY1;
@@ -738,50 +1046,50 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
       cy = TILEY - dy;
       dy = 0;
     }
-    else if (y > BY2)          /* Element kommt von unten ins Bild */
+    else if (y > BY2)          /* object enters playfield from the bottom */
     {
       y = BY2;
       height = -dy;
       dy = TILEY + dy;
     }
-    else if (y==BY1 && dy<0)   /* Element verläßt oben das Bild */
+    else if (y==BY1 && dy < 0) /* object leaves playfield to the top */
     {
       height += dy;
       cy = -dy;
       dy = 0;
     }
-    else if (dy > 0 && cut_mode==CUT_ABOVE)
+    else if (dy > 0 && cut_mode == CUT_ABOVE)
     {
-      if (y == BY2)            /* Element unterhalb des Bildes */
+      if (y == BY2)            /* object completely above bottom border */
        return;
 
       height = dy;
-      cy = TILEY-dy;
+      cy = TILEY - dy;
       dy = TILEY;
       MarkTileDirty(x, y + 1);
-    }                          /* Element verläßt unten das Bild */
-    else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW))
+    }                          /* object leaves playfield to the bottom */
+    else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW))
       height -= dy;
-    else if (dy)               /* allg. Bewegung in y-Richtung */
+    else if (dy)               /* general vertical movement */
       MarkTileDirty(x, y + SIGN(dy));
   }
 
-  if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
-  {
-    graphic -= GFX_START_ROCKSSCREEN;
-    XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
-             SX+(graphic % GFX_PER_LINE)*TILEX+cx,
-             SY+(graphic / GFX_PER_LINE)*TILEY+cy,
-             width,height, FX+x*TILEX+dx,FY+y*TILEY+dy);
-  }
-  else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
-  {
-    graphic -= GFX_START_ROCKSHEROES;
-    XCopyArea(display,pix[PIX_HEROES],drawto_field,gc,
-             (graphic % HEROES_PER_LINE)*TILEX+cx,
-             (graphic / HEROES_PER_LINE)*TILEY+cy,
-             width,height, FX+x*TILEX+dx,FY+y*TILEY+dy);
-  }
+  src_bitmap = graphic_info[graphic].bitmap;
+  src_x = graphic_info[graphic].src_x;
+  src_y = graphic_info[graphic].src_y;
+  offset_x = graphic_info[graphic].offset_x;
+  offset_y = graphic_info[graphic].offset_y;
+
+  drawing_gc = src_bitmap->stored_clip_gc;
+
+  src_x += frame * offset_x;
+  src_y += frame * offset_y;
+
+  src_x += cx;
+  src_y += cy;
+
+  dest_x = FX + x * TILEX + dx;
+  dest_y = FY + y * TILEY + dy;
 
 #if DEBUG
   if (!IN_SCR_FIELD(x,y))
@@ -792,259 +1100,196 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode)
   }
 #endif
 
-  MarkTileDirty(x,y);
-}
-
-void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode)
-{
-  int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
-  int graphic = el2gfx(element);
-  int phase4 = ABS(MovPos[ux][uy])/(TILEX/4);
-  int phase  = phase4 / 2;
-  int dir = MovDir[ux][uy];
-
-  if (element==EL_PACMAN || element==EL_KAEFER || element==EL_FLIEGER)
-  {
-    graphic += 4*!phase;
-
-    if (dir == MV_UP)
-      graphic += 1;
-    else if (dir == MV_LEFT)
-      graphic += 2;
-    else if (dir == MV_DOWN)
-      graphic += 3;
-  }
-  else if (element==EL_MAULWURF || element==EL_PINGUIN ||
-          element==EL_SCHWEIN || element==EL_DRACHE)
-  {
-    if (dir==MV_LEFT)
-      graphic = (element==EL_MAULWURF ? GFX_MAULWURF_LEFT :
-                element==EL_PINGUIN ? GFX_PINGUIN_LEFT :
-                element==EL_SCHWEIN ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
-    else if (dir==MV_RIGHT)
-      graphic = (element==EL_MAULWURF ? GFX_MAULWURF_RIGHT :
-                element==EL_PINGUIN ? GFX_PINGUIN_RIGHT :
-                element==EL_SCHWEIN ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
-    else if (dir==MV_UP)
-      graphic = (element==EL_MAULWURF ? GFX_MAULWURF_UP :
-                element==EL_PINGUIN ? GFX_PINGUIN_UP :
-                element==EL_SCHWEIN ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
-    else
-      graphic = (element==EL_MAULWURF ? GFX_MAULWURF_DOWN :
-                element==EL_PINGUIN ? GFX_PINGUIN_DOWN :
-                element==EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
-
-    graphic += phase4;
-  }
-  else if (element==EL_SONDE)
-  {
-    graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
-  }
-  else if (element==EL_BUTTERFLY || element==EL_FIREFLY)
-  {
-    graphic += !phase;
-  }
-  else if ((element==EL_FELSBROCKEN || IS_GEM(element)) && !cut_mode)
-  {
-    graphic += phase * (element==EL_FELSBROCKEN ? 2 : 1);
-  }
-  else if ((element==EL_SIEB_LEER || element==EL_SIEB2_LEER ||
-           element==EL_SIEB_VOLL || element==EL_SIEB2_VOLL) && SiebAktiv)
-  {
-    graphic += 3-(SiebAktiv%8)/2;
-  }
-  else if (IS_AMOEBOID(element))
+  if (mask_mode == USE_MASKING)
   {
-    graphic = (element==EL_AMOEBE_TOT ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
-    graphic += (x+2*y) % 4;
+    SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
+    BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height,
+                    dest_x, dest_y);
   }
-  else if (element==EL_MAUER_LEBT)
-  {
-    BOOL links_massiv = FALSE, rechts_massiv = FALSE;
-
-    if (!IN_LEV_FIELD(ux-1,uy) || IS_MAUER(Feld[ux-1][uy]))
-      links_massiv = TRUE;
-    if (!IN_LEV_FIELD(ux+1,uy) || IS_MAUER(Feld[ux+1][uy]))
-      rechts_massiv = TRUE;
+  else
+    BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
+              dest_x, dest_y);
 
-    if (links_massiv && rechts_massiv)
-      graphic = GFX_MAUERWERK;
-    else if (links_massiv)
-      graphic = GFX_MAUER_R;
-    else if (rechts_massiv)
-      graphic = GFX_MAUER_L;
-  }
+  MarkTileDirty(x,y);
+}
 
-  if (dx || dy)
-    DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode);
-  else
-    DrawGraphic(x,y, graphic);
+void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy, int graphic,
+                               int frame, int cut_mode)
+{
+  DrawGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING);
 }
 
-void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
-                               int cut_mode)
+void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
+                         int cut_mode, int mask_mode)
 {
-  int width = TILEX, height = TILEY;
-  int cx = 0, cy = 0;
-  int src_x,src_y, dest_x,dest_y;
+  int lx = LEVELX(x), ly = LEVELY(y);
+  int graphic;
+  int frame;
 
-  if (graphic < 0)
+  if (IN_LEV_FIELD(lx, ly))
   {
-    DrawGraphic(x,y,graphic);
-    return;
+    SetRandomAnimationValue(lx, ly);
+
+    graphic = el_act_dir2img(element, GfxAction[lx][ly], MovDir[lx][ly]);
+    frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]);
+  }
+  else /* border element */
+  {
+    graphic = el2img(element);
+    frame = getGraphicAnimationFrame(graphic, -1);
   }
 
-  if (dx || dy)                        /* Verschiebung der Grafik? */
+  if (element == EL_WALL_GROWING)
   {
-    if (x < BX1)               /* Element kommt von links ins Bild */
-    {
-      x = BX1;
-      width = dx;
-      cx = TILEX - dx;
-      dx = 0;
-    }
-    else if (x > BX2)          /* Element kommt von rechts ins Bild */
-    {
-      x = BX2;
-      width = -dx;
-      dx = TILEX + dx;
-    }
-    else if (x==BX1 && dx<0)   /* Element verläßt links das Bild */
-    {
-      width += dx;
-      cx = -dx;
-      dx = 0;
-    }
-    else if (x==BX2 && dx>0)   /* Element verläßt rechts das Bild */
-      width -= dx;
-    else if (dx)               /* allg. Bewegung in x-Richtung */
-      MarkTileDirty(x + SIGN(dx), y);
+    boolean left_stopped = FALSE, right_stopped = FALSE;
 
-    if (y < BY1)               /* Element kommt von oben ins Bild */
-    {
-      if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */
-       return;
+    if (!IN_LEV_FIELD(lx - 1, ly) || IS_MAUER(Feld[lx - 1][ly]))
+      left_stopped = TRUE;
+    if (!IN_LEV_FIELD(lx + 1, ly) || IS_MAUER(Feld[lx + 1][ly]))
+      right_stopped = TRUE;
 
-      y = BY1;
-      height = dy;
-      cy = TILEY - dy;
-      dy = 0;
-    }
-    else if (y > BY2)          /* Element kommt von unten ins Bild */
+    if (left_stopped && right_stopped)
+      graphic = IMG_WALL;
+    else if (left_stopped)
     {
-      y = BY2;
-      height = -dy;
-      dy = TILEY + dy;
+      graphic = IMG_WALL_GROWING_ACTIVE_RIGHT;
+      frame = graphic_info[graphic].anim_frames - 1;
     }
-    else if (y==BY1 && dy<0)   /* Element verläßt oben das Bild */
+    else if (right_stopped)
     {
-      height += dy;
-      cy = -dy;
-      dy = 0;
+      graphic = IMG_WALL_GROWING_ACTIVE_LEFT;
+      frame = graphic_info[graphic].anim_frames - 1;
     }
-    else if (dy > 0 && cut_mode==CUT_ABOVE)
-    {
-      if (y == BY2)            /* Element unterhalb des Bildes */
-       return;
+  }
+#if 0
+  else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
+  {
+    graphic = (element == EL_BD_AMOEBA ? IMG_BD_AMOEBA_PART1 :
+              element == EL_AMOEBA_WET ? IMG_AMOEBA_WET_PART1 :
+              element == EL_AMOEBA_DRY ? IMG_AMOEBA_DRY_PART1 :
+              element == EL_AMOEBA_FULL ? IMG_AMOEBA_FULL_PART1 :
+              IMG_AMOEBA_DEAD_PART1);
 
-      height = dy;
-      cy = TILEY-dy;
-      dy = TILEY;
-      MarkTileDirty(x, y + 1);
-    }                          /* Element verläßt unten das Bild */
-    else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW))
-      height -= dy;
-    else if (dy)               /* allg. Bewegung in y-Richtung */
-      MarkTileDirty(x, y + SIGN(dy));
+    graphic += (x + 2 * y + 4) % 4;
+  }
+#endif
+
+#if 0
+  if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
+  {
+    if (Feld[lx][ly] == EL_AMOEBA_DRIPPING)
+      printf("---> %d -> %d / %d [%d]\n",
+            element, graphic, frame, GfxRandom[lx][ly]);
   }
+#endif
 
-  if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
-  {
-    graphic -= GFX_START_ROCKSSCREEN;
-    src_x  = SX+(graphic % GFX_PER_LINE)*TILEX+cx;
-    src_y  = SY+(graphic / GFX_PER_LINE)*TILEY+cy;
-    dest_x = FX+x*TILEX+dx;
-    dest_y = FY+y*TILEY+dy;
+  if (dx || dy)
+    DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
+  else if (mask_mode == USE_MASKING)
+    DrawGraphicThruMask(x, y, graphic, frame);
+  else
+    DrawGraphic(x, y, graphic, frame);
+}
 
-    XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
-    XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
-              src_x,src_y, width,height, dest_x,dest_y);
-  }
-  else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
-  {
-    graphic -= GFX_START_ROCKSHEROES;
-    src_x  = (graphic % HEROES_PER_LINE)*TILEX+cx;
-    src_y  = (graphic / HEROES_PER_LINE)*TILEY+cy;
-    dest_x = FX+x*TILEX+dx;
-    dest_y = FY+y*TILEY+dy;
+void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
+                        int cut_mode, int mask_mode)
+{
+  if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+    DrawScreenElementExt(SCREENX(x), SCREENY(y), dx, dy, element,
+                        cut_mode, mask_mode);
+}
 
-    XSetClipOrigin(display,clip_gc[PIX_HEROES],dest_x-src_x,dest_y-src_y);
-    XCopyArea(display,pix[PIX_HEROES],drawto_field,clip_gc[PIX_HEROES],
-              src_x,src_y, width,height, dest_x,dest_y);
-  }
+void DrawScreenElementShifted(int x, int y, int dx, int dy, int element,
+                             int cut_mode)
+{
+  DrawScreenElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
+}
 
-#if DEBUG
-  if (!IN_SCR_FIELD(x,y))
-  {
-    printf("DrawGraphicShiftedThruMask(): x = %d, y = %d, graphic = %d\n",
-          x,y,graphic);
-    printf("DrawGraphicShifted(): This should never happen!\n");
-    return;
-  }
+void DrawLevelElementShifted(int x, int y, int dx, int dy, int element,
+                            int cut_mode)
+{
+  DrawLevelElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
+}
+
+#if 0
+void DrawOldScreenElementThruMask(int x, int y, int element)
+{
+  DrawOldScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
+}
+
+void DrawScreenElementThruMask(int x, int y, int element)
+{
+  DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
+}
 #endif
 
-  MarkTileDirty(x,y);
+void DrawLevelElementThruMask(int x, int y, int element)
+{
+  DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
 }
 
-void ErdreichAnbroeckeln(int x, int y)
+void DrawLevelFieldThruMask(int x, int y)
 {
+  DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING);
+}
+
+void DrawCrumbledSand(int x, int y)
+{
+  Bitmap *src_bitmap;
+  int src_x, src_y;
   int i, width, height, cx,cy;
-  int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
+  int lx = LEVELX(x), ly = LEVELY(y);
   int element, graphic;
   int snip = 4;
   static int xy[4][2] =
   {
-    { 0,-1 },
-    { -1,0 },
-    { +1,0 },
-    { 0,+1 }
+    { 0, -1 },
+    { -1, 0 },
+    { +1, 0 },
+    { 0, +1 }
   };
 
-  if (!IN_LEV_FIELD(ux,uy))
+  if (!IN_LEV_FIELD(lx, ly))
     return;
 
-  element = Feld[ux][uy];
+  element = Feld[lx][ly];
 
-  if (element==EL_ERDREICH)
+  if (element == EL_SAND ||
+      element == EL_LANDMINE ||
+      element == EL_TRAP ||
+      element == EL_TRAP_ACTIVE)
   {
-    if (!IN_SCR_FIELD(x,y))
+    if (!IN_SCR_FIELD(x, y))
       return;
 
-    graphic = GFX_ERDENRAND;
+    graphic = IMG_SAND_CRUMBLED;
+
+    src_bitmap = graphic_info[graphic].bitmap;
+    src_x = graphic_info[graphic].src_x;
+    src_y = graphic_info[graphic].src_y;
 
-    for(i=0;i<4;i++)
+    for(i=0; i<4; i++)
     {
-      int uxx,uyy;
+      int lxx, lyy;
 
-      uxx = ux+xy[i][0];
-      uyy = uy+xy[i][1];
-      if (!IN_LEV_FIELD(uxx,uyy))
-       element = EL_BETON;
+      lxx = lx + xy[i][0];
+      lyy = ly + xy[i][1];
+      if (!IN_LEV_FIELD(lxx, lyy))
+       element = EL_STEELWALL;
       else
-       element = Feld[uxx][uyy];
+       element = Feld[lxx][lyy];
 
-/*
-      if (element==EL_ERDREICH || IS_SOLID(element))
-       continue;
-*/
-      if (element==EL_ERDREICH)
+      if (element == EL_SAND ||
+         element == EL_LANDMINE ||
+         element == EL_TRAP ||
+         element == EL_TRAP_ACTIVE)
        continue;
 
-      if (i==1 || i==2)
+      if (i == 1 || i == 2)
       {
        width = snip;
        height = TILEY;
-       cx = (i==2 ? TILEX-snip : 0);
+       cx = (i == 2 ? TILEX - snip : 0);
        cy = 0;
       }
       else
@@ -1052,44 +1297,45 @@ void ErdreichAnbroeckeln(int x, int y)
        width = TILEX;
        height = snip;
        cx = 0;
-       cy = (i==3 ? TILEY-snip : 0);
+       cy = (i == 3 ? TILEY - snip : 0);
       }
 
-      XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
-               SX+(graphic % GFX_PER_LINE)*TILEX+cx,
-               SY+(graphic / GFX_PER_LINE)*TILEY+cy,
-               width,height, FX+x*TILEX+cx,FY+y*TILEY+cy);
+      BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy,
+                width, height, FX + x * TILEX + cx, FY + y * TILEY + cy);
     }
 
-    MarkTileDirty(x,y);
+    MarkTileDirty(x, y);
   }
   else
   {
-    graphic = GFX_ERDENRAND;
+    graphic = IMG_SAND_CRUMBLED;
 
-    for(i=0;i<4;i++)
-    {
-      int xx,yy,uxx,uyy;
-
-      xx = x+xy[i][0];
-      yy = y+xy[i][1];
-      uxx = ux+xy[i][0];
-      uyy = uy+xy[i][1];
-/*
-      if (!IN_LEV_FIELD(uxx,uyy) || Feld[uxx][uyy]!=EL_ERDREICH ||
-         !IN_SCR_FIELD(xx,yy) || IS_SOLID(element))
-       continue;
-*/
+    src_bitmap = graphic_info[graphic].bitmap;
+    src_x = graphic_info[graphic].src_x;
+    src_y = graphic_info[graphic].src_y;
 
-      if (!IN_LEV_FIELD(uxx,uyy) || Feld[uxx][uyy]!=EL_ERDREICH ||
-         !IN_SCR_FIELD(xx,yy))
+    for(i=0; i<4; i++)
+    {
+      int xx, yy, lxx, lyy;
+
+      xx = x + xy[i][0];
+      yy = y + xy[i][1];
+      lxx = lx + xy[i][0];
+      lyy = ly + xy[i][1];
+
+      if (!IN_LEV_FIELD(lxx, lyy) ||
+         (Feld[lxx][lyy] != EL_SAND &&
+          Feld[lxx][lyy] != EL_LANDMINE &&
+          Feld[lxx][lyy] != EL_TRAP &&
+          Feld[lxx][lyy] != EL_TRAP_ACTIVE) ||
+         !IN_SCR_FIELD(xx, yy))
        continue;
 
-      if (i==1 || i==2)
+      if (i == 1 || i == 2)
       {
        width = snip;
        height = TILEY;
-       cx = (i==1 ? TILEX-snip : 0);
+       cx = (i == 1 ? TILEX - snip : 0);
        cy = 0;
       }
       else
@@ -1100,118 +1346,158 @@ void ErdreichAnbroeckeln(int x, int y)
        cy = (i==0 ? TILEY-snip : 0);
       }
 
-      XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
-               SX+(graphic % GFX_PER_LINE)*TILEX+cx,
-               SY+(graphic / GFX_PER_LINE)*TILEY+cy,
-               width,height, FX+xx*TILEX+cx,FY+yy*TILEY+cy);
+      BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy,
+                width, height, FX + xx * TILEX + cx, FY + yy * TILEY + cy);
 
-      MarkTileDirty(xx,yy);
+      MarkTileDirty(xx, yy);
     }
   }
 }
 
+static int getBorderElement(int x, int y)
+{
+  int border[7][2] =
+  {
+    { EL_STEELWALL_TOPLEFT,            EL_INVISIBLE_STEELWALL_TOPLEFT     },
+    { EL_STEELWALL_TOPRIGHT,           EL_INVISIBLE_STEELWALL_TOPRIGHT    },
+    { EL_STEELWALL_BOTTOMLEFT,         EL_INVISIBLE_STEELWALL_BOTTOMLEFT  },
+    { EL_STEELWALL_BOTTOMRIGHT,                EL_INVISIBLE_STEELWALL_BOTTOMRIGHT },
+    { EL_STEELWALL_VERTICAL,           EL_INVISIBLE_STEELWALL_VERTICAL    },
+    { EL_STEELWALL_HORIZONTAL,         EL_INVISIBLE_STEELWALL_HORIZONTAL  },
+    { EL_STEELWALL,                    EL_INVISIBLE_STEELWALL             }
+  };
+  int steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
+  int steel_position = (x == -1 && y == -1                     ? 0 :
+                       x == lev_fieldx && y == -1              ? 1 :
+                       x == -1 && y == lev_fieldy              ? 2 :
+                       x == lev_fieldx && y == lev_fieldy      ? 3 :
+                       x == -1 || x == lev_fieldx              ? 4 :
+                       y == -1 || y == lev_fieldy              ? 5 : 6);
+
+  return border[steel_position][steel_type];
+}
+
 void DrawScreenElement(int x, int y, int element)
 {
-  DrawElementShifted(x,y,0,0,element,CUT_NO_CUTTING);
-  ErdreichAnbroeckeln(x,y);
+  DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
+  DrawCrumbledSand(x, y);
 }
 
 void DrawLevelElement(int x, int y, int element)
 {
-  if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-    DrawScreenElement(SCROLLX(x),SCROLLY(y),element);
+  if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+    DrawScreenElement(SCREENX(x), SCREENY(y), element);
 }
 
 void DrawScreenField(int x, int y)
 {
-  int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
-  int element;
+  int lx = LEVELX(x), ly = LEVELY(y);
+  int element, content;
 
-  if (!IN_LEV_FIELD(ux,uy))
+  if (!IN_LEV_FIELD(lx, ly))
   {
-    DrawScreenElement(x,y,EL_BETON);
+    if (lx < -1 || lx > lev_fieldx || ly < -1 || ly > lev_fieldy)
+      element = EL_EMPTY;
+    else
+      element = getBorderElement(lx, ly);
+
+    DrawScreenElement(x, y, element);
     return;
   }
 
-  element = Feld[ux][uy];
+  element = Feld[lx][ly];
+  content = Store[lx][ly];
 
-  if (IS_MOVING(ux,uy))
+  if (IS_MOVING(lx, ly))
   {
-    int horiz_move = (MovDir[ux][uy]==MV_LEFT || MovDir[ux][uy]==MV_RIGHT);
-    BOOL cut_mode = CUT_NO_CUTTING;
+    int horiz_move = (MovDir[lx][ly] == MV_LEFT || MovDir[lx][ly] == MV_RIGHT);
+    boolean cut_mode = NO_CUTTING;
 
-    if (Store[ux][uy]==EL_MORAST_LEER ||
-       Store[ux][uy]==EL_SIEB_LEER ||
-       Store[ux][uy]==EL_SIEB2_LEER ||
-       Store[ux][uy]==EL_AMOEBE_NASS)
+    if (element == EL_QUICKSAND_EMPTYING ||
+       element == EL_MAGIC_WALL_EMPTYING ||
+       element == EL_BD_MAGIC_WALL_EMPTYING ||
+       element == EL_AMOEBA_DRIPPING)
       cut_mode = CUT_ABOVE;
-    else if (Store[ux][uy]==EL_MORAST_VOLL ||
-       Store[ux][uy]==EL_SIEB_VOLL ||
-       Store[ux][uy]==EL_SIEB2_VOLL ||
-       Store[ux][uy]==EL_SALZSAEURE)
+    else if (element == EL_QUICKSAND_FILLING ||
+            element == EL_MAGIC_WALL_FILLING ||
+            element == EL_BD_MAGIC_WALL_FILLING)
       cut_mode = CUT_BELOW;
 
-    if (cut_mode==CUT_ABOVE)
-      DrawElementShifted(x,y,0,0,Store[ux][uy],CUT_NO_CUTTING);
+    if (cut_mode == CUT_ABOVE)
+      DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
     else
-      DrawScreenElement(x,y,EL_LEERRAUM);
+      DrawScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
-      DrawElementShifted(x,y,MovPos[ux][uy],0,element,CUT_NO_CUTTING);
+      DrawScreenElementShifted(x, y, MovPos[lx][ly], 0, element, NO_CUTTING);
+    else if (cut_mode == NO_CUTTING)
+      DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], element, cut_mode);
     else
-      DrawElementShifted(x,y,0,MovPos[ux][uy],element,cut_mode);
+      DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode);
+
+    if (content == EL_ACID)
+      DrawLevelElementThruMask(lx, ly + 1, EL_ACID);
   }
-  else if (IS_BLOCKED(ux,uy))
+  else if (IS_BLOCKED(lx, ly))
   {
-    int oldx,oldy;
+    int oldx, oldy;
     int sx, sy;
     int horiz_move;
-    BOOL cut_mode = CUT_NO_CUTTING;
-
-    Blocked2Moving(ux,uy,&oldx,&oldy);
-    sx = SCROLLX(oldx);
-    sy = SCROLLY(oldy);
-    horiz_move = (MovDir[oldx][oldy]==MV_LEFT || MovDir[oldx][oldy]==MV_RIGHT);
-
-    if (Store[oldx][oldy]==EL_MORAST_LEER ||
-       Store[oldx][oldy]==EL_SIEB_LEER ||
-       Store[oldx][oldy]==EL_SIEB2_LEER ||
-       Store[oldx][oldy]==EL_AMOEBE_NASS)
+    boolean cut_mode = NO_CUTTING;
+    int element_old, content_old;
+
+    Blocked2Moving(lx, ly, &oldx, &oldy);
+    sx = SCREENX(oldx);
+    sy = SCREENY(oldy);
+    horiz_move = (MovDir[oldx][oldy] == MV_LEFT ||
+                 MovDir[oldx][oldy] == MV_RIGHT);
+
+    element_old = Feld[oldx][oldy];
+    content_old = Store[oldx][oldy];
+
+    if (element_old == EL_QUICKSAND_EMPTYING ||
+       element_old == EL_MAGIC_WALL_EMPTYING ||
+       element_old == EL_BD_MAGIC_WALL_EMPTYING ||
+       element_old == EL_AMOEBA_DRIPPING)
       cut_mode = CUT_ABOVE;
 
-    DrawScreenElement(x,y,EL_LEERRAUM);
-    element = Feld[oldx][oldy];
+    DrawScreenElement(x, y, EL_EMPTY);
 
     if (horiz_move)
-      DrawElementShifted(sx,sy,MovPos[oldx][oldy],0,element,CUT_NO_CUTTING);
+      DrawScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
+                              NO_CUTTING);
+    else if (cut_mode == NO_CUTTING)
+      DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old,
+                              cut_mode);
     else
-      DrawElementShifted(sx,sy,0,MovPos[oldx][oldy],element,cut_mode);
+      DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old,
+                              cut_mode);
   }
   else if (IS_DRAWABLE(element))
-    DrawScreenElement(x,y,element);
+    DrawScreenElement(x, y, element);
   else
-    DrawScreenElement(x,y,EL_LEERRAUM);
+    DrawScreenElement(x, y, EL_EMPTY);
 }
 
 void DrawLevelField(int x, int y)
 {
-  if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
-    DrawScreenField(SCROLLX(x),SCROLLY(y));
-  else if (IS_MOVING(x,y))
+  if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+    DrawScreenField(SCREENX(x), SCREENY(y));
+  else if (IS_MOVING(x, y))
   {
     int newx,newy;
 
-    Moving2Blocked(x,y,&newx,&newy);
-    if (IN_SCR_FIELD(SCROLLX(newx),SCROLLY(newy)))
-      DrawScreenField(SCROLLX(newx),SCROLLY(newy));
+    Moving2Blocked(x, y, &newx, &newy);
+    if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
+      DrawScreenField(SCREENX(newx), SCREENY(newy));
   }
-  else if (IS_BLOCKED(x,y))
+  else if (IS_BLOCKED(x, y))
   {
-    int oldx,oldy;
+    int oldx, oldy;
 
-    Blocked2Moving(x,y,&oldx,&oldy);
-    if (IN_SCR_FIELD(SCROLLX(oldx),SCROLLY(oldy)))
-      DrawScreenField(SCROLLX(oldx),SCROLLY(oldy));
+    Blocked2Moving(x, y, &oldx, &oldy);
+    if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy)))
+      DrawScreenField(SCREENX(oldx), SCREENY(oldy));
   }
 }
 
@@ -1219,301 +1505,507 @@ void DrawMiniElement(int x, int y, int element)
 {
   int graphic;
 
-  if (!element)
-  {
-    DrawMiniGraphic(x,y,-1);
-    return;
-  }
-
-  graphic = el2gfx(element);
-  DrawMiniGraphic(x,y,graphic);
+  graphic = el2edimg(element);
+  DrawMiniGraphic(x, y, graphic);
 }
 
-void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y)
+void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
 {
-  if (x+scroll_x<-1 || x+scroll_x>lev_fieldx ||
-      y+scroll_y<-1 || y+scroll_y>lev_fieldy)
-    DrawMiniElement(x,y,EL_LEERRAUM);
-  else if (x+scroll_x==-1 || x+scroll_x==lev_fieldx ||
-          y+scroll_y==-1 || y+scroll_y==lev_fieldy)
-    DrawMiniElement(x,y,EL_BETON);
+  int x = sx + scroll_x, y = sy + scroll_y;
+
+  if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
+    DrawMiniElement(sx, sy, EL_EMPTY);
+  else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
+    DrawMiniElement(sx, sy, Feld[x][y]);
   else
-    DrawMiniElement(x,y,Feld[x+scroll_x][y+scroll_y]);
+    DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y)));
 }
 
-void DrawMicroElement(int xpos, int ypos, int element)
+void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
-  int graphic;
+  Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+  int mini_startx = src_bitmap->width * 3 / 4;
+  int mini_starty = src_bitmap->height * 2 / 3;
+  int src_x = mini_startx + graphic_info[graphic].src_x / 8;
+  int src_y = mini_starty + graphic_info[graphic].src_y / 8;
 
-  if (element==EL_LEERRAUM)
-    return;
+  if (src_x + MICRO_TILEX > src_bitmap->width ||
+      src_y + MICRO_TILEY > src_bitmap->height)
+  {
+    /* graphic of desired size seems not to be contained in this image;
+       dirty workaround: get it from the middle of the normal sized image */
+
+    getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
+    src_x += (TILEX / 2 - MICRO_TILEX / 2);
+    src_y += (TILEY / 2 - MICRO_TILEY / 2);
+  }
 
-  graphic = el2gfx(element);
+  *bitmap = src_bitmap;
+  *x = src_x;
+  *y = src_y;
+}
+
+void DrawMicroElement(int xpos, int ypos, int element)
+{
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int graphic = el2preimg(element);
 
-  XCopyArea(display,pix[PIX_BACK],drawto,gc,
-           MICRO_GFX_STARTX+(graphic % MICRO_GFX_PER_LINE)*MICRO_TILEX,
-           MICRO_GFX_STARTY+(graphic / MICRO_GFX_PER_LINE)*MICRO_TILEY,
-           MICRO_TILEX,MICRO_TILEY, xpos,ypos);
+  getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+  BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY,
+            xpos, ypos);
 }
 
 void DrawLevel()
 {
   int x,y;
 
+  SetDrawBackgroundMask(REDRAW_NONE);
   ClearWindow();
 
   for(x=BX1; x<=BX2; x++)
     for(y=BY1; y<=BY2; y++)
-      DrawScreenField(x,y);
+      DrawScreenField(x, y);
 
-  if (soft_scrolling_on)
-    XCopyArea(display,fieldbuffer,backbuffer,gc,
-             FX,FY, SXSIZE,SYSIZE,
-             SX,SY);
-
-  redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
+  redraw_mask |= REDRAW_FIELD;
 }
 
-void DrawMiniLevel(int scroll_x, int scroll_y)
+void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
 {
   int x,y;
 
-  ClearWindow();
-
-  for(x=0;x<2*SCR_FIELDX;x++)
-    for(y=0;y<2*SCR_FIELDY;y++)
-      DrawMiniElementOrWall(x,y,scroll_x,scroll_y);
+  for(x=0; x<size_x; x++)
+    for(y=0; y<size_y; y++)
+      DrawMiniElementOrWall(x, y, scroll_x, scroll_y);
 
   redraw_mask |= REDRAW_FIELD;
 }
 
-void DrawMicroLevel(int xpos, int ypos)
+static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y)
 {
-  int x,y;
+  int x, y;
+
+  DrawBackground(xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE);
 
-  XFillRectangle(display,drawto,gc,
-                xpos-MICRO_TILEX,ypos-MICRO_TILEY,
-                MICRO_TILEX*(STD_LEV_FIELDX+2),
-                MICRO_TILEY*(STD_LEV_FIELDY+2));
   if (lev_fieldx < STD_LEV_FIELDX)
-    xpos += (STD_LEV_FIELDX - lev_fieldx)/2 * MICRO_TILEX;
+    xpos += (STD_LEV_FIELDX - lev_fieldx) / 2 * MICRO_TILEX;
   if (lev_fieldy < STD_LEV_FIELDY)
-    ypos += (STD_LEV_FIELDY - lev_fieldy)/2 * MICRO_TILEY;
+    ypos += (STD_LEV_FIELDY - lev_fieldy) / 2 * MICRO_TILEY;
+
+  xpos += MICRO_TILEX;
+  ypos += MICRO_TILEY;
+
+  for(x=-1; x<=STD_LEV_FIELDX; x++)
+  {
+    for(y=-1; y<=STD_LEV_FIELDY; y++)
+    {
+      int lx = from_x + x, ly = from_y + y;
+
+      if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy)
+       DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
+                        Ur[lx][ly]);
+      else if (lx >= -1 && lx < lev_fieldx+1 && ly >= -1 && ly < lev_fieldy+1
+              && BorderElement != EL_EMPTY)
+       DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
+                        getBorderElement(lx, ly));
+    }
+  }
 
-  for(x=-1;x<=STD_LEV_FIELDX;x++)
-    for(y=-1;y<=STD_LEV_FIELDY;y++)
-      if (x>=0 && x<lev_fieldx && y>=0 && y<lev_fieldy)
-       DrawMicroElement(xpos+MICRO_TILEX*x,ypos+MICRO_TILEY*y,
-                        Feld[x][y]=Ur[x][y]);
-      else if (x>=-1 && x<lev_fieldx+1 && y>=-1 && y<lev_fieldy+1)
-       DrawMicroElement(xpos+MICRO_TILEX*x,ypos+MICRO_TILEY*y,
-                        EL_BETON);
+  redraw_mask |= REDRAW_MICROLEVEL;
+}
+
+#define MICROLABEL_EMPTY               0
+#define MICROLABEL_LEVEL_NAME          1
+#define MICROLABEL_CREATED_BY          2
+#define MICROLABEL_LEVEL_AUTHOR                3
+#define MICROLABEL_IMPORTED_FROM       4
+#define MICROLABEL_LEVEL_IMPORT_INFO   5
+
+#define MAX_MICROLABEL_SIZE            (SXSIZE / FONT4_XSIZE)
+
+static void DrawMicroLevelLabelExt(int mode)
+{
+  char label_text[MAX_MICROLABEL_SIZE + 1];
+
+  DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE);
 
-  XFillRectangle(display,drawto,gc, SX,MICROLABEL_YPOS, SXSIZE,FONT4_YSIZE);
+  strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name :
+                      mode == MICROLABEL_CREATED_BY ? "created by" :
+                      mode == MICROLABEL_LEVEL_AUTHOR ? level.author :
+                      mode == MICROLABEL_IMPORTED_FROM ? "imported from" :
+                      mode == MICROLABEL_LEVEL_IMPORT_INFO ?
+                      leveldir_current->imported_from : ""),
+         MAX_MICROLABEL_SIZE);
+  label_text[MAX_MICROLABEL_SIZE] = '\0';
 
-  if (level.name)
+  if (strlen(label_text) > 0)
   {
-    int len = strlen(level.name);
-    int lxpos = SX+(SXSIZE-len*FONT4_XSIZE)/2;
+    int lxpos = SX + (SXSIZE - strlen(label_text) * FONT4_XSIZE) / 2;
     int lypos = MICROLABEL_YPOS;
 
-    DrawText(lxpos,lypos,level.name,FS_SMALL,FC_SPECIAL2);
+    DrawText(lxpos, lypos, label_text, FS_SMALL, FC_SPECIAL2);
+  }
+
+  redraw_mask |= REDRAW_MICROLEVEL;
+}
+
+void DrawMicroLevel(int xpos, int ypos, boolean restart)
+{
+  static unsigned long scroll_delay = 0;
+  static unsigned long label_delay = 0;
+  static int from_x, from_y, scroll_direction;
+  static int label_state, label_counter;
+
+  if (restart)
+  {
+    from_x = from_y = 0;
+    scroll_direction = MV_RIGHT;
+    label_state = 1;
+    label_counter = 0;
+
+    DrawMicroLevelExt(xpos, ypos, from_x, from_y);
+    DrawMicroLevelLabelExt(label_state);
+
+    /* initialize delay counters */
+    DelayReached(&scroll_delay, 0);
+    DelayReached(&label_delay, 0);
+
+    return;
+  }
+
+  /* scroll micro level, if needed */
+  if ((lev_fieldx > STD_LEV_FIELDX || lev_fieldy > STD_LEV_FIELDY) &&
+      DelayReached(&scroll_delay, MICROLEVEL_SCROLL_DELAY))
+  {
+    switch (scroll_direction)
+    {
+      case MV_LEFT:
+       if (from_x > 0)
+         from_x--;
+       else
+         scroll_direction = MV_UP;
+       break;
+
+      case MV_RIGHT:
+       if (from_x < lev_fieldx - STD_LEV_FIELDX)
+         from_x++;
+       else
+         scroll_direction = MV_DOWN;
+       break;
+
+      case MV_UP:
+       if (from_y > 0)
+         from_y--;
+       else
+         scroll_direction = MV_RIGHT;
+       break;
+
+      case MV_DOWN:
+       if (from_y < lev_fieldy - STD_LEV_FIELDY)
+         from_y++;
+       else
+         scroll_direction = MV_LEFT;
+       break;
+
+      default:
+       break;
+    }
+
+    DrawMicroLevelExt(xpos, ypos, from_x, from_y);
   }
 
-  redraw_mask |= REDRAW_MICROLEV;
+  /* redraw micro level label, if needed */
+  if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 &&
+      strcmp(level.author, ANONYMOUS_NAME) != 0 &&
+      strcmp(level.author, leveldir_current->name) != 0 &&
+      DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY))
+  {
+    int max_label_counter = 23;
+
+    if (leveldir_current->imported_from != NULL)
+      max_label_counter += 14;
+
+    label_counter = (label_counter + 1) % max_label_counter;
+    label_state = (label_counter >= 0 && label_counter <= 7 ?
+                  MICROLABEL_LEVEL_NAME :
+                  label_counter >= 9 && label_counter <= 12 ?
+                  MICROLABEL_CREATED_BY :
+                  label_counter >= 14 && label_counter <= 21 ?
+                  MICROLABEL_LEVEL_AUTHOR :
+                  label_counter >= 23 && label_counter <= 26 ?
+                  MICROLABEL_IMPORTED_FROM :
+                  label_counter >= 28 && label_counter <= 35 ?
+                  MICROLABEL_LEVEL_IMPORT_INFO : MICROLABEL_EMPTY);
+    DrawMicroLevelLabelExt(label_state);
+  }
 }
 
-int AYS_in_range(int x, int y)
+int REQ_in_range(int x, int y)
 {
-  if (y>DY+249 && y<DY+278)
+  if (y > DY+249 && y < DY+278)
   {
-    if (x>DX+1 && x<DX+48)
-      return(1);
-    else if (x>DX+51 && x<DX+98) 
-      return(2);
+    if (x > DX+1 && x < DX+48)
+      return 1;
+    else if (x > DX+51 && x < DX+98) 
+      return 2;
   }
-  return(0);
+  return 0;
 }
 
-BOOL AreYouSure(char *text, unsigned int ays_state)
+#define MAX_REQUEST_LINES              13
+#define MAX_REQUEST_LINE_LEN           7
+
+boolean Request(char *text, unsigned int req_state)
 {
-  int mx,my, ty, result = -1;
+  int mx, my, ty, result = -1;
   unsigned int old_door_state;
 
+#if defined(PLATFORM_UNIX)
+  /* pause network game while waiting for request to answer */
+  if (options.network &&
+      game_status == PLAYING &&
+      req_state & REQUEST_WAIT_FOR)
+    SendToServer_PausePlaying();
+#endif
+
   old_door_state = GetDoorState();
 
+  UnmapAllGadgets();
+
   CloseDoor(DOOR_CLOSE_1);
 
-  /* Alten Türinhalt sichern */
-  XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-           DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
-           DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1);
+  /* 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);
 
-  /* Fragetext schreiben */
-  XFillRectangle(display,pix[PIX_DB_DOOR],gc,
-                DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1,DXSIZE,DYSIZE);
+  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
-  for(ty=0;ty<13;ty++)
+  /* clear door drawing field */
+  DrawBackground(DX, DY, DXSIZE, DYSIZE);
+
+  /* write text for request */
+  for(ty=0; ty < MAX_REQUEST_LINES; ty++)
   {
-    int tx,tl,tc;
-    char txt[256];
+    char text_line[MAX_REQUEST_LINE_LEN + 1];
+    int tx, tl, tc;
 
-    if (!(*text))
+    if (!*text)
       break;
-    for(tl=0,tx=0;tx<7;tl++,tx++)
+
+    for(tl=0,tx=0; tx < MAX_REQUEST_LINE_LEN; tl++,tx++)
     {
-      tc=*(text+tx);
-      if (!tc || tc==32)
+      tc = *(text + tx);
+      if (!tc || tc == ' ')
        break;
     }
+
     if (!tl)
     { 
       text++; 
       ty--; 
       continue; 
     }
-    sprintf(txt,text); 
-    txt[tl]=0;
-    DrawTextExt(pix[PIX_DB_DOOR],gc,
-               DOOR_GFX_PAGEX1+51-(tl*14)/2,SY+ty*16,txt,FS_SMALL,FC_YELLOW);
-    text+=(tl+(tc==32));
-  }
-
-  if (ays_state & AYS_ASK)
-    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-             DOOR_GFX_PAGEX4,OK_BUTTON_GFX_YPOS,
-             DXSIZE,OK_BUTTON_YSIZE,
-             DOOR_GFX_PAGEX1,OK_BUTTON_YPOS);
-  else if (ays_state & AYS_CONFIRM)
-    XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
-             DOOR_GFX_PAGEX4,CONFIRM_BUTTON_GFX_YPOS,
-             DXSIZE,CONFIRM_BUTTON_YSIZE,
-             DOOR_GFX_PAGEX1,CONFIRM_BUTTON_YPOS);
+
+    strncpy(text_line, text, tl);
+    text_line[tl] = 0;
+
+    DrawText(DX + 50 - (tl * 14)/2, DY + 8 + ty * 16,
+            text_line, FS_SMALL, FC_YELLOW);
+
+    text += tl + (tc == ' ' ? 1 : 0);
+  }
+
+  if (req_state & REQ_ASK)
+  {
+    MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_NO]);
+  }
+  else if (req_state & REQ_CONFIRM)
+  {
+    MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]);
+  }
+  else if (req_state & REQ_PLAYER)
+  {
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]);
+    MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]);
+  }
+
+  /* copy request gadgets to door backbuffer */
+  BlitBitmap(drawto, bitmap_db_door,
+            DX, DY, DXSIZE, DYSIZE,
+            DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
   OpenDoor(DOOR_OPEN_1);
+
+#if 0
   ClearEventQueue();
+#endif
+
+  if (!(req_state & REQUEST_WAIT_FOR))
+  {
+    SetDrawBackgroundMask(REDRAW_FIELD);
 
-  if (!(ays_state & AYS_ASK) && !(ays_state & AYS_CONFIRM))
-    return(FALSE);
+    return FALSE;
+  }
 
   if (game_status != MAINMENU)
     InitAnimation();
 
   button_status = MB_RELEASED;
 
-  while(result<0)
-  {
-    DoAnimation();
-    Delay(10000);
+  request_gadget_id = -1;
+
+  SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
-    if (XPending(display))
+  while(result < 0)
+  {
+    if (PendingEvent())
     {
-      XEvent event;
+      Event event;
+
+      NextEvent(&event);
 
-      XNextEvent(display, &event);
       switch(event.type)
       {
-       case Expose:
-         HandleExposeEvent((XExposeEvent *) &event);
-         break;
-       case UnmapNotify:
-         SleepWhileUnmapped();
-         break;
-       case ButtonPress:
-       case ButtonRelease:
-       case MotionNotify:
+       case EVENT_BUTTONPRESS:
+       case EVENT_BUTTONRELEASE:
+       case EVENT_MOTIONNOTIFY:
        {
-         int choice;
-
-         if (event.type == MotionNotify)
+         if (event.type == EVENT_MOTIONNOTIFY)
          {
+           if (!PointerInWindow(window))
+             continue; /* window and pointer are on different screens */
+
+           if (!button_status)
+             continue;
+
            motion_status = TRUE;
-           mx = ((XMotionEvent *) &event)->x;
-           my = ((XMotionEvent *) &event)->y;
+           mx = ((MotionEvent *) &event)->x;
+           my = ((MotionEvent *) &event)->y;
          }
          else
          {
            motion_status = FALSE;
-           mx = ((XButtonEvent *) &event)->x;
-           my = ((XButtonEvent *) &event)->y;
-           if (event.type==ButtonPress)
-             button_status = ((XButtonEvent *) &event)->button;
+           mx = ((ButtonEvent *) &event)->x;
+           my = ((ButtonEvent *) &event)->y;
+           if (event.type == EVENT_BUTTONPRESS)
+             button_status = ((ButtonEvent *) &event)->button;
            else
              button_status = MB_RELEASED;
          }
 
-         if (ays_state & AYS_ASK)
-           choice = CheckChooseButtons(mx,my,button_status);
-         else
-           choice = CheckConfirmButton(mx,my,button_status);
+         /* this sets 'request_gadget_id' */
+         HandleGadgets(mx, my, button_status);
 
-         switch(choice)
+         switch(request_gadget_id)
          {
-           case BUTTON_OK:
+           case TOOL_CTRL_ID_YES:
              result = TRUE;
              break;
-           case BUTTON_NO:
+           case TOOL_CTRL_ID_NO:
              result = FALSE;
              break;
-           case BUTTON_CONFIRM:
-             result = TRUE|FALSE;
+           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;
        }
-       case KeyPress:
-         switch(XLookupKeysym((XKeyEvent *)&event,
-                              ((XKeyEvent *)&event)->state))
+
+       case EVENT_KEYPRESS:
+         switch(GetEventKey((KeyEvent *)&event, TRUE))
          {
-           case XK_Return:
+           case KSYM_Return:
              result = 1;
              break;
-           case XK_Escape:
+
+           case KSYM_Escape:
              result = 0;
              break;
+
+           default:
+             break;
          }
+         if (req_state & REQ_PLAYER)
+           result = 0;
          break;
-       case FocusIn:
-       case FocusOut:
-         HandleFocusEvent((XFocusChangeEvent *) &event);
-         break;
-        case ClientMessage:
-         HandleClientMessageEvent((XClientMessageEvent *) &event);
+
+       case EVENT_KEYRELEASE:
+         ClearPlayerAction();
          break;
+
        default:
+         HandleOtherEvents(&event);
          break;
       }
     }
-    else if (JoystickButton() == JOY_BUTTON_NEW_PRESSED)
+    else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED)
     {
-      int joy=Joystick();
+      int joy = AnyJoystick();
 
       if (joy & JOY_BUTTON_1)
        result = 1;
       else if (joy & JOY_BUTTON_2)
        result = 0;
     }
+
+    DoAnimation();
+
+    /* don't eat all CPU time */
+    Delay(10);
   }
 
   if (game_status != MAINMENU)
     StopAnimation();
 
-  if (!(ays_state & AYS_STAY_OPEN))
+  UnmapToolButtons();
+
+  if (!(req_state & REQ_STAY_OPEN))
   {
     CloseDoor(DOOR_CLOSE_1);
 
-    if (!(ays_state & AYS_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
+    if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
     {
-      XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-               DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
-               DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
+      BlitBitmap(bitmap_db_door, bitmap_db_door,
+                DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
+                DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
       OpenDoor(DOOR_OPEN_1);
     }
   }
 
-  return(result);
+  RemapAllGadgets();
+
+  SetDrawBackgroundMask(REDRAW_FIELD);
+
+#if defined(PLATFORM_UNIX)
+  /* continue network game after request */
+  if (options.network &&
+      game_status == PLAYING &&
+      req_state & REQUEST_WAIT_FOR)
+    SendToServer_ContinuePlaying();
+#endif
+
+  return result;
 }
 
 unsigned int OpenDoor(unsigned int door_state)
@@ -1522,18 +2014,14 @@ unsigned int OpenDoor(unsigned int door_state)
 
   if (door_state & DOOR_COPY_BACK)
   {
-    XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
-             DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE+VYSIZE,
-             DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
+    BlitBitmap(bitmap_db_door, bitmap_db_door,
+              DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE + VYSIZE,
+              DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
     door_state &= ~DOOR_COPY_BACK;
   }
 
   new_door_state = MoveDoor(door_state);
 
-/*
-  ClearEventQueue();
-*/
-
   return(new_door_state);
 }
 
@@ -1541,292 +2029,452 @@ unsigned int CloseDoor(unsigned int door_state)
 {
   unsigned int new_door_state;
 
-  XCopyArea(display,backbuffer,pix[PIX_DB_DOOR],gc,
-           DX,DY, DXSIZE,DYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
-  XCopyArea(display,backbuffer,pix[PIX_DB_DOOR],gc,
-           VX,VY, VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
+  BlitBitmap(backbuffer, bitmap_db_door,
+            DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
+  BlitBitmap(backbuffer, bitmap_db_door,
+            VX, VY, VXSIZE, VYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
 
   new_door_state = MoveDoor(door_state);
 
-/*
-  ClearEventQueue();
-*/
-
   return(new_door_state);
 }
 
 unsigned int GetDoorState()
 {
-  return(MoveDoor(DOOR_GET_STATE));
+  return MoveDoor(DOOR_GET_STATE);
 }
 
-unsigned int MoveDoor(unsigned int door_state)
+unsigned int SetDoorState(unsigned int door_state)
 {
-  static unsigned int door1 = DOOR_OPEN_1;
-  static unsigned int door2 = DOOR_CLOSE_2;
-  int x, start, stepsize = 4, door_anim_delay = stepsize*5000;
+  return MoveDoor(door_state | DOOR_SET_STATE);
+}
 
-#ifdef MSDOS
-  stepsize = 2;
-#endif
+unsigned int MoveDoor(unsigned int door_state)
+{
+  static int door1 = DOOR_OPEN_1;
+  static int door2 = DOOR_CLOSE_2;
+  static unsigned long door_delay = 0;
+  int x, start, stepsize = 2;
+  unsigned long door_delay_value = stepsize * 5;
 
   if (door_state == DOOR_GET_STATE)
     return(door1 | door2);
 
-  if (door1==DOOR_OPEN_1 && door_state & DOOR_OPEN_1)
+  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 (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)
+  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)
+  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)
+  else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2)
     door_state &= ~DOOR_CLOSE_2;
 
-  if (quick_doors)
+  if (setup.quick_doors)
   {
     stepsize = 20;
-    door_anim_delay = 0;
-    StopSound(SND_OEFFNEN);
+    door_delay_value = 0;
+
+    StopSound(SND_MENU_DOOR_OPENING);
+    StopSound(SND_MENU_DOOR_CLOSING);
+  }
+
+  if (global.autoplay_leveldir)
+  {
+    door_state |= DOOR_NO_DELAY;
+    door_state &= ~DOOR_CLOSE_ALL;
   }
 
   if (door_state & DOOR_ACTION)
   {
     if (!(door_state & DOOR_NO_DELAY))
-      PlaySoundStereo(SND_OEFFNEN,PSND_MAX_RIGHT);
+    {
+      /* opening door sound has priority over simultaneously closing door */
+      if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2))
+       PlaySoundStereo(SND_MENU_DOOR_OPENING, SOUND_MAX_RIGHT);
+      else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2))
+       PlaySoundStereo(SND_MENU_DOOR_CLOSING, SOUND_MAX_RIGHT);
+    }
 
     start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0);
 
-    for(x=start;x<=DXSIZE;x+=stepsize)
+    for(x=start; x<=DXSIZE; x+=stepsize)
     {
+      Bitmap *bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
+      GC gc = bitmap->stored_clip_gc;
+
+      if (!(door_state & DOOR_NO_DELAY))
+       WaitUntilDelayReached(&door_delay, door_delay_value);
+
       if (door_state & DOOR_ACTION_1)
       {
        int i = (door_state & DOOR_OPEN_1 ? DXSIZE-x : x);
-       int j = (DXSIZE - i)/3;
-
-       XCopyArea(display,pix[PIX_DB_DOOR],drawto,gc,
-                 DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1+i/2,
-                 DXSIZE,DYSIZE-i/2, DX,DY);
-
-       XFillRectangle(display,drawto,gc,DX,DY+DYSIZE-i/2,DXSIZE,i/2);
-
-       XSetClipOrigin(display,clip_gc[PIX_DOOR],
-                      DX-i,(DY+j)-DOOR_GFX_PAGEY1);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE,DOOR_GFX_PAGEY1, i,77, DX+DXSIZE-i,DY+j);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE,DOOR_GFX_PAGEY1+140, i,63, DX+DXSIZE-i,DY+140+j);
-       XSetClipOrigin(display,clip_gc[PIX_DOOR],
-                      DX-DXSIZE+i,DY-(DOOR_GFX_PAGEY1+j));
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE-i,DOOR_GFX_PAGEY1+j, i,77-j, DX,DY);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE-i,DOOR_GFX_PAGEY1+140, i,63, DX,DY+140-j);
-
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE-i,DOOR_GFX_PAGEY1+77, i,63,
-                 DX,DY+77-j);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE-i,DOOR_GFX_PAGEY1+203, i,77,
-                 DX,DY+203-j);
-       XSetClipOrigin(display,clip_gc[PIX_DOOR],
-                      DX-i,(DY+j)-DOOR_GFX_PAGEY1);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE,DOOR_GFX_PAGEY1+77, i,63,
-                 DX+DXSIZE-i,DY+77+j);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 DXSIZE,DOOR_GFX_PAGEY1+203, i,77-j,
-                 DX+DXSIZE-i,DY+203+j);
+       int j = (DXSIZE - i) / 3;
+
+       BlitBitmap(bitmap_db_door, drawto,
+                  DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + i/2,
+                  DXSIZE,DYSIZE - i/2, DX, DY);
+
+       ClearRectangle(drawto, DX, DY + DYSIZE - i/2, DXSIZE,i/2);
+
+       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);
 
        redraw_mask |= REDRAW_DOOR_1;
       }
 
       if (door_state & DOOR_ACTION_2)
       {
-       int i = (door_state & DOOR_OPEN_2 ? VXSIZE-x : x);
-       int j = (VXSIZE - i)/3;
-
-       XCopyArea(display,pix[PIX_DB_DOOR],drawto,gc,
-                 DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2+i/2,
-                 VXSIZE,VYSIZE-i/2, VX,VY);
-
-       XFillRectangle(display,drawto,gc,VX,VY+VYSIZE-i/2,VXSIZE,i/2);
-
-       XSetClipOrigin(display,clip_gc[PIX_DOOR],
-                      VX-i,(VY+j)-DOOR_GFX_PAGEY2);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 VXSIZE,DOOR_GFX_PAGEY2, i,VYSIZE/2, VX+VXSIZE-i,VY+j);
-       XSetClipOrigin(display,clip_gc[PIX_DOOR],
-                      VX-VXSIZE+i,VY-(DOOR_GFX_PAGEY2+j));
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 VXSIZE-i,DOOR_GFX_PAGEY2+j, i,VYSIZE/2-j, VX,VY);
-
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 VXSIZE-i,DOOR_GFX_PAGEY2+VYSIZE/2, i,VYSIZE/2,
-                 VX,VY+VYSIZE/2-j);
-       XSetClipOrigin(display,clip_gc[PIX_DOOR],
-                      VX-i,(VY+j)-DOOR_GFX_PAGEY2);
-       XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR],
-                 VXSIZE,DOOR_GFX_PAGEY2+VYSIZE/2, i,VYSIZE/2-j,
-                 VX+VXSIZE-i,VY+VYSIZE/2+j);
+       int i = (door_state & DOOR_OPEN_2 ? VXSIZE - x : x);
+       int j = (VXSIZE - i) / 3;
+
+       BlitBitmap(bitmap_db_door, drawto,
+                  DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + i/2,
+                  VXSIZE, VYSIZE - i/2, VX, VY);
+
+       ClearRectangle(drawto, VX, VY + VYSIZE-i/2, VXSIZE, i/2);
+
+       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);
 
        redraw_mask |= REDRAW_DOOR_2;
       }
 
       BackToFront();
-#ifndef MSDOS
-      Delay(door_anim_delay);
-#endif
 
-      if (game_status==MAINMENU)
+      if (game_status == MAINMENU)
        DoAnimation();
     }
   }
 
+  if (setup.quick_doors)
+  {
+    StopSound(SND_MENU_DOOR_OPENING);
+    StopSound(SND_MENU_DOOR_CLOSING);
+  }
+
   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);
+  return (door1 | door2);
+}
+
+void DrawSpecialEditorDoor()
+{
+  /* draw bigger 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 - 4, VY - 4, EXSIZE + 8, EYSIZE - VYSIZE + 4,
+            EX - 4, EY - 4);
+
+  redraw_mask |= REDRAW_ALL;
 }
 
-int ReadPixel(Drawable d, int x, int y)
+void UndrawSpecialEditorDoor()
 {
-  static XImage *pixelimage;
+  /* draw normal tape recorder window */
+  BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
+            EX - 4, EY - 12, EXSIZE + 8, EYSIZE - VYSIZE + 12,
+            EX - 4, EY - 12);
 
-  pixelimage = XGetImage(display, d, x,y, 1,1, AllPlanes, ZPixmap);
-  return(XGetPixel(pixelimage,0,0));
+  redraw_mask |= REDRAW_ALL;
 }
 
-int el2gfx(int element)
+#ifndef        TARGET_SDL
+int ReadPixel(DrawBuffer *bitmap, int x, int y)
 {
-  switch(element)
+  XImage *pixel_image;
+  unsigned long pixel_value;
+
+  pixel_image = XGetImage(display, bitmap->drawable,
+                         x, y, 1, 1, AllPlanes, ZPixmap);
+  pixel_value = XGetPixel(pixel_image, 0, 0);
+
+  XDestroyImage(pixel_image);
+
+  return pixel_value;
+}
+#endif
+
+/* ---------- new tool button stuff ---------------------------------------- */
+
+/* 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++)
   {
-    case EL_LEERRAUM:          return(-1);
-    case EL_ERDREICH:          return(GFX_ERDREICH);
-    case EL_MAUERWERK:         return(GFX_MAUERWERK);
-    case EL_FELSBODEN:         return(GFX_FELSBODEN);
-    case EL_FELSBROCKEN:       return(GFX_FELSBROCKEN);
-    case EL_SCHLUESSEL:                return(GFX_SCHLUESSEL);
-    case EL_EDELSTEIN:         return(GFX_EDELSTEIN);
-    case EL_AUSGANG_ZU:                return(GFX_AUSGANG_ZU);
-    case EL_AUSGANG_ACT:       return(GFX_AUSGANG_ACT);
-    case EL_AUSGANG_AUF:       return(GFX_AUSGANG_AUF);
-    case EL_SPIELFIGUR:                return(GFX_SPIELFIGUR);
-    case EL_SPIELER1:          return(GFX_SPIELER1);
-    case EL_SPIELER2:          return(GFX_SPIELER2);
-    case EL_SPIELER3:          return(GFX_SPIELER3);
-    case EL_SPIELER4:          return(GFX_SPIELER4);
-    case EL_KAEFER:            return(GFX_KAEFER);
-    case EL_KAEFER_R:          return(GFX_KAEFER_R);
-    case EL_KAEFER_O:          return(GFX_KAEFER_O);
-    case EL_KAEFER_L:          return(GFX_KAEFER_L);
-    case EL_KAEFER_U:          return(GFX_KAEFER_U);
-    case EL_FLIEGER:           return(GFX_FLIEGER);
-    case EL_FLIEGER_R:         return(GFX_FLIEGER_R);
-    case EL_FLIEGER_O:         return(GFX_FLIEGER_O);
-    case EL_FLIEGER_L:         return(GFX_FLIEGER_L);
-    case EL_FLIEGER_U:         return(GFX_FLIEGER_U);
-    case EL_BUTTERFLY:         return(GFX_BUTTERFLY);
-    case EL_BUTTERFLY_R:       return(GFX_BUTTERFLY_R);
-    case EL_BUTTERFLY_O:       return(GFX_BUTTERFLY_O);
-    case EL_BUTTERFLY_L:       return(GFX_BUTTERFLY_L);
-    case EL_BUTTERFLY_U:       return(GFX_BUTTERFLY_U);
-    case EL_FIREFLY:           return(GFX_FIREFLY);
-    case EL_FIREFLY_R:         return(GFX_FIREFLY_R);
-    case EL_FIREFLY_O:         return(GFX_FIREFLY_O);
-    case EL_FIREFLY_L:         return(GFX_FIREFLY_L);
-    case EL_FIREFLY_U:         return(GFX_FIREFLY_U);
-    case EL_MAMPFER:           return(GFX_MAMPFER);
-    case EL_ROBOT:             return(GFX_ROBOT);
-    case EL_BETON:             return(GFX_BETON);
-    case EL_DIAMANT:           return(GFX_DIAMANT);
-    case EL_MORAST_LEER:       return(GFX_MORAST_LEER);
-    case EL_MORAST_VOLL:       return(GFX_MORAST_VOLL);
-    case EL_TROPFEN:           return(GFX_TROPFEN);
-    case EL_BOMBE:             return(GFX_BOMBE);
-    case EL_SIEB_LEER:         return(GFX_SIEB_LEER);
-    case EL_SIEB_VOLL:         return(GFX_SIEB_VOLL);
-    case EL_SIEB_TOT:          return(GFX_SIEB_TOT);
-    case EL_SALZSAEURE:                return(GFX_SALZSAEURE);
-    case EL_AMOEBE_TOT:                return(GFX_AMOEBE_TOT);
-    case EL_AMOEBE_NASS:       return(GFX_AMOEBE_NASS);
-    case EL_AMOEBE_NORM:       return(GFX_AMOEBE_NORM);
-    case EL_AMOEBE_VOLL:       return(GFX_AMOEBE_VOLL);
-    case EL_AMOEBE_BD:         return(GFX_AMOEBE_BD);
-    case EL_AMOEBA2DIAM:       return(GFX_AMOEBA2DIAM);
-    case EL_KOKOSNUSS:         return(GFX_KOKOSNUSS);
-    case EL_LIFE:              return(GFX_LIFE);
-    case EL_LIFE_ASYNC:                return(GFX_LIFE_ASYNC);
-    case EL_DYNAMIT:           return(GFX_DYNAMIT);
-    case EL_BADEWANNE:         return(GFX_BADEWANNE);
-    case EL_BADEWANNE1:                return(GFX_BADEWANNE1);
-    case EL_BADEWANNE2:                return(GFX_BADEWANNE2);
-    case EL_BADEWANNE3:                return(GFX_BADEWANNE3);
-    case EL_BADEWANNE4:                return(GFX_BADEWANNE4);
-    case EL_BADEWANNE5:                return(GFX_BADEWANNE5);
-    case EL_ABLENK_AUS:                return(GFX_ABLENK_AUS);
-    case EL_ABLENK_EIN:                return(GFX_ABLENK_EIN);
-    case EL_SCHLUESSEL1:       return(GFX_SCHLUESSEL1);
-    case EL_SCHLUESSEL2:       return(GFX_SCHLUESSEL2);
-    case EL_SCHLUESSEL3:       return(GFX_SCHLUESSEL3);
-    case EL_SCHLUESSEL4:       return(GFX_SCHLUESSEL4);
-    case EL_PFORTE1:           return(GFX_PFORTE1);
-    case EL_PFORTE2:           return(GFX_PFORTE2);
-    case EL_PFORTE3:           return(GFX_PFORTE3);
-    case EL_PFORTE4:           return(GFX_PFORTE4);
-    case EL_PFORTE1X:          return(GFX_PFORTE1X);
-    case EL_PFORTE2X:          return(GFX_PFORTE2X);
-    case EL_PFORTE3X:          return(GFX_PFORTE3X);
-    case EL_PFORTE4X:          return(GFX_PFORTE4X);
-    case EL_DYNAMIT_AUS:       return(GFX_DYNAMIT_AUS);
-    case EL_PACMAN:            return(GFX_PACMAN);
-    case EL_PACMAN_R:          return(GFX_PACMAN_R);
-    case EL_PACMAN_O:          return(GFX_PACMAN_O);
-    case EL_PACMAN_L:          return(GFX_PACMAN_L);
-    case EL_PACMAN_U:          return(GFX_PACMAN_U);
-    case EL_UNSICHTBAR:                return(GFX_UNSICHTBAR);
-    case EL_ERZ_EDEL:          return(GFX_ERZ_EDEL);
-    case EL_ERZ_DIAM:          return(GFX_ERZ_DIAM);
-    case EL_BIRNE_AUS:         return(GFX_BIRNE_AUS);
-    case EL_BIRNE_EIN:         return(GFX_BIRNE_EIN);
-    case EL_ZEIT_VOLL:         return(GFX_ZEIT_VOLL);
-    case EL_ZEIT_LEER:         return(GFX_ZEIT_LEER);
-    case EL_MAUER_LEBT:                return(GFX_MAUER_LEBT);
-    case EL_EDELSTEIN_BD:      return(GFX_EDELSTEIN_BD);
-    case EL_EDELSTEIN_GELB:    return(GFX_EDELSTEIN_GELB);
-    case EL_EDELSTEIN_ROT:     return(GFX_EDELSTEIN_ROT);
-    case EL_EDELSTEIN_LILA:    return(GFX_EDELSTEIN_LILA);
-    case EL_ERZ_EDEL_BD:       return(GFX_ERZ_EDEL_BD);
-    case EL_ERZ_EDEL_GELB:     return(GFX_ERZ_EDEL_GELB);
-    case EL_ERZ_EDEL_ROT:      return(GFX_ERZ_EDEL_ROT);
-    case EL_ERZ_EDEL_LILA:     return(GFX_ERZ_EDEL_LILA);
-    case EL_MAMPFER2:          return(GFX_MAMPFER2);
-    case EL_SIEB2_LEER:                return(GFX_SIEB2_LEER);
-    case EL_SIEB2_VOLL:                return(GFX_SIEB2_VOLL);
-    case EL_SIEB2_TOT:         return(GFX_SIEB2_TOT);
-    case EL_DYNABOMB:          return(GFX_DYNABOMB);
-    case EL_DYNABOMB_NR:       return(GFX_DYNABOMB_NR);
-    case EL_DYNABOMB_SZ:       return(GFX_DYNABOMB_SZ);
-    case EL_DYNABOMB_XL:       return(GFX_DYNABOMB_XL);
-    case EL_SOKOBAN_OBJEKT:    return(GFX_SOKOBAN_OBJEKT);
-    case EL_SOKOBAN_FELD_LEER: return(GFX_SOKOBAN_FELD_LEER);
-    case EL_SOKOBAN_FELD_VOLL: return(GFX_SOKOBAN_FELD_VOLL);
-    case EL_MAULWURF:          return(GFX_MAULWURF);
-    case EL_PINGUIN:           return(GFX_PINGUIN);
-    case EL_SCHWEIN:           return(GFX_SCHWEIN);
-    case EL_DRACHE:            return(GFX_DRACHE);
-    case EL_SONDE:             return(GFX_SONDE);
-    case EL_PFEIL_L:           return(GFX_PFEIL_L);
-    case EL_PFEIL_R:           return(GFX_PFEIL_R);
-    case EL_PFEIL_O:           return(GFX_PFEIL_O);
-    case EL_PFEIL_U:           return(GFX_PFEIL_U);
-    default:
+    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 long 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)
     {
-      if (IS_CHAR(element))
-       return(GFX_CHAR_START + (element-EL_CHAR_START));
-      else
-       return(-1);
+      int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
+
+      getMiniGraphicSource(PLAYER_NR_GFX(IMG_PLAYER1, 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 + toolbutton_info[i].x,
+                     GDI_Y, DY + 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_EVENT_MASK, event_mask,
+                     GDI_CALLBACK_ACTION, HandleToolButtons,
+                     GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    tool_gadget[id] = gi;
+  }
+}
+
+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;
+}
+
+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_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_AMOEBA_DRIPPING:           return EL_AMOEBA_WET;
+
+    default:                           return element;
   }
 }
+
+int el_act_dir2img(int element, int action, int direction)
+{
+  direction = MV_DIR_BIT(direction);
+
+  return element_info[element].direction_graphic[action][direction];
+}
+
+int el_act2img(int element, int action)
+{
+  return element_info[element].graphic[action];
+}
+
+int el_dir2img(int element, int direction)
+{
+  return el_act_dir2img(element, ACTION_DEFAULT, direction);
+}
+
+int el2img(int element)
+{
+  return element_info[element].graphic[ACTION_DEFAULT];
+}
+
+int el2edimg(int element)
+{
+  return element_info[element].editor_graphic;
+}
+
+int el2preimg(int element)
+{
+  return element_info[element].preview_graphic;
+}