X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=8ed62a521b36a2fbc2fefd7ceeadf38f710e9ae1;hb=f22f670b327fa0e074a4ef0889585a33afb7f8a3;hp=74d003cdbf7b2bdc65d71b8b43024ebc00a3824f;hpb=7db0a9ae54a91806b66eb918f28309bb875e3b69;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 74d003cd..8ed62a52 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -32,9 +32,6 @@
 #define NUM_TOOL_BUTTONS	7
 
 /* forward declaration for internal use */
-static int getGraphicAnimationPhase(int, int, int);
-static void DrawGraphicAnimationShiftedThruMask(int, int, int, int, int,
-						int, int, int);
 static void UnmapToolButtons();
 static void HandleToolButtons(struct GadgetInfo *);
 
@@ -386,6 +383,39 @@ void ClearWindow()
   redraw_mask |= REDRAW_FIELD;
 }
 
+static int getGraphicAnimationPhase(int frames, int delay, int mode)
+{
+  int phase;
+
+  if (mode & ANIM_PINGPONG)
+  {
+    int max_anim_frames = 2 * frames - 2;
+
+    phase = (FrameCounter % (delay * max_anim_frames)) / delay;
+    phase = (phase < frames ? phase : max_anim_frames - phase);
+  }
+  else
+    phase = (FrameCounter % (delay * frames)) / delay;
+
+  if (mode & ANIM_REVERSE)
+    phase = -phase;
+
+  return phase;
+}
+
+inline int getGraphicAnimationFrame(int graphic, int sync_frame)
+{
+  /* animation synchronized with global frame counter, not move position */
+  if (new_graphic_info[graphic].anim_global_sync || sync_frame < 0)
+    sync_frame = FrameCounter;
+
+  return getAnimationFrame(new_graphic_info[graphic].anim_frames,
+			   new_graphic_info[graphic].anim_delay,
+			   new_graphic_info[graphic].anim_mode,
+			   new_graphic_info[graphic].anim_start_frame,
+			   sync_frame);
+}
+
 void MarkTileDirty(int x, int y)
 {
   int xx = redraw_x1 + x;
@@ -442,7 +472,8 @@ void DrawPlayer(struct PlayerInfo *player)
   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, phase;
+  int graphic;
+  int frame = 0;
   boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE);
 
   if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
@@ -468,6 +499,7 @@ void DrawPlayer(struct PlayerInfo *player)
     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
@@ -519,44 +551,44 @@ void DrawPlayer(struct PlayerInfo *player)
        ((action & (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)) &&
 	!(action & ~(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN))));
 
-    graphic = GFX_SP_MURPHY;
+    graphic = IMG_SP_MURPHY;
 
     if (player->Pushing)
     {
       if (player->MovDir == MV_LEFT)
-	graphic = GFX_MURPHY_PUSH_LEFT;
+	graphic = IMG_SP_MURPHY_LEFT_PUSHING;
       else if (player->MovDir == MV_RIGHT)
-	graphic = GFX_MURPHY_PUSH_RIGHT;
+	graphic = IMG_SP_MURPHY_RIGHT_PUSHING;
       else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
-	graphic = GFX_MURPHY_PUSH_LEFT;
+	graphic = IMG_SP_MURPHY_LEFT_PUSHING;
       else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
-	graphic = GFX_MURPHY_PUSH_RIGHT;
+	graphic = IMG_SP_MURPHY_RIGHT_PUSHING;
     }
     else if (player->snapped)
     {
       if (player->MovDir == MV_LEFT)
-	graphic = GFX_MURPHY_SNAP_LEFT;
+	graphic = IMG_SP_MURPHY_LEFT_SNAPPING;
       else if (player->MovDir == MV_RIGHT)
-	graphic = GFX_MURPHY_SNAP_RIGHT;
+	graphic = IMG_SP_MURPHY_RIGHT_SNAPPING;
       else if (player->MovDir == MV_UP)
-	graphic = GFX_MURPHY_SNAP_UP;
+	graphic = IMG_SP_MURPHY_UP_SNAPPING;
       else if (player->MovDir == MV_DOWN)
-	graphic = GFX_MURPHY_SNAP_DOWN;
+	graphic = IMG_SP_MURPHY_DOWN_SNAPPING;
     }
     else if (action_moving)
     {
       if (player->MovDir == MV_LEFT)
-	graphic = GFX_MURPHY_GO_LEFT;
+	graphic = IMG_SP_MURPHY_LEFT_MOVING;
       else if (player->MovDir == MV_RIGHT)
-	graphic = GFX_MURPHY_GO_RIGHT;
+	graphic = IMG_SP_MURPHY_RIGHT_MOVING;
       else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
-	graphic = GFX_MURPHY_GO_LEFT;
+	graphic = IMG_SP_MURPHY_LEFT_MOVING;
       else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
-	graphic = GFX_MURPHY_GO_RIGHT;
+	graphic = IMG_SP_MURPHY_RIGHT_MOVING;
       else
-	graphic = GFX_MURPHY_GO_LEFT;
+	graphic = IMG_SP_MURPHY_LEFT_MOVING;
 
-      graphic += getGraphicAnimationPhase(3, 2, ANIM_PINGPONG);
+      frame = getGraphicAnimationFrame(graphic, -1);
     }
 
     if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
@@ -565,18 +597,29 @@ void DrawPlayer(struct PlayerInfo *player)
   else
   {
     if (player->MovDir == MV_LEFT)
-      graphic =
-	(player->Pushing ? GFX_SPIELER1_PUSH_LEFT : GFX_SPIELER1_LEFT);
+      graphic = (player->Pushing ? IMG_PLAYER1_LEFT_PUSHING :
+		 player->is_moving ? IMG_PLAYER1_LEFT_MOVING :
+		 IMG_PLAYER1_LEFT);
     else if (player->MovDir == MV_RIGHT)
-      graphic =
-	(player->Pushing ? GFX_SPIELER1_PUSH_RIGHT : GFX_SPIELER1_RIGHT);
+      graphic = (player->Pushing ? IMG_PLAYER1_RIGHT_PUSHING :
+		 player->is_moving ? IMG_PLAYER1_RIGHT_MOVING :
+		 IMG_PLAYER1_RIGHT);
     else if (player->MovDir == MV_UP)
-      graphic = GFX_SPIELER1_UP;
+      graphic = (player->Pushing ? IMG_PLAYER1_UP_PUSHING :
+		 player->is_moving ? IMG_PLAYER1_UP_MOVING :
+		 IMG_PLAYER1_UP);
     else	/* MV_DOWN || MV_NO_MOVING */
-      graphic = GFX_SPIELER1_DOWN;
+      graphic = (player->Pushing ? IMG_PLAYER1_DOWN_PUSHING :
+		 player->is_moving ? IMG_PLAYER1_DOWN_MOVING :
+		 IMG_PLAYER1_DOWN);
+
+    graphic = PLAYER_NR_GFX(graphic, player->index_nr);
 
-    graphic += player->index_nr * 3 * HEROES_PER_LINE;
-    graphic += player->Frame;
+#if 0
+    frame = player->Frame;
+#else
+    frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
   }
 
   if (player->GfxPos)
@@ -590,43 +633,73 @@ void DrawPlayer(struct PlayerInfo *player)
   if (!setup.soft_scrolling && ScreenMovPos)
     sxx = syy = 0;
 
-  DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, NO_CUTTING);
+#if 0
+  if (player->Frame)
+    printf("-> %d\n", player->Frame);
+#endif
+
+  DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
 
   if (SHIELD_ON(player))
   {
-    int graphic = (player->shield_active_time_left ? GFX2_SHIELD_ACTIVE :
-		   GFX2_SHIELD_PASSIVE);
+    int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE :
+		   IMG_SHIELD_NORMAL_ACTIVE);
+    int frame = getGraphicAnimationFrame(graphic, -1);
 
-    DrawGraphicAnimationShiftedThruMask(sx, sy, sxx, syy, graphic,
-					3, 8, ANIM_PINGPONG);
+    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 (element == EL_SOKOBAN_FIELD_EMPTY ||
 	Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
-      DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT,
+      DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT, 0,
 				 NO_CUTTING);
     else
     {
       int element = Feld[next_jx][next_jy];
-      int graphic = el2gfx(element);
+      int graphic = el2img(element);
+#if 1
+      int frame = 0;
+#endif
 
       if ((element == EL_ROCK ||
-	   element == EL_SP_ZONK ||
-	   element == EL_BD_ROCK) && sxx)
+	   element == EL_BD_ROCK ||
+	   element == EL_SP_ZONK) && sxx)
       {
-	int phase = (player->GfxPos / (TILEX / 4));
+	graphic = el_dir_act2img(element, player->MovDir, GFX_ACTION_MOVING);
+#if 1
+	frame = getGraphicAnimationFrame(graphic, player->GfxPos);
+
+	frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
+
+#if 0
+	printf("-> %d [%d]\n", player->Frame, player->GfxPos);
+#endif
 
+#if 0
+	/* !!! FIX !!! */
 	if (player->MovDir == MV_LEFT)
-	  graphic += phase;
-	else
-	  graphic += (phase + 4) % 4;
+	  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, NO_CUTTING, NO_MASKING);
+      DrawGraphicShifted(px, py, sxx, syy, graphic, frame,
+			 NO_CUTTING, NO_MASKING);
     }
   }
 
@@ -634,39 +707,48 @@ void DrawPlayer(struct PlayerInfo *player)
 
   if (IS_ACTIVE_BOMB(element))
   {
-    graphic = el2gfx(element);
+    graphic = el2img(element);
 
+#if 0
     if (element == EL_DYNAMITE_ACTIVE)
     {
-      if ((phase = (96 - MovDelay[jx][jy]) / 12) > 6)
-	phase = 6;
+      if ((frame = (96 - MovDelay[jx][jy]) / 12) > 6)
+	frame = 6;
     }
     else
     {
-      if ((phase = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3)
-	phase = 7 - phase;
+      if ((frame = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3)
+	frame = 7 - frame;
     }
+#else
+    frame = getGraphicAnimationFrame(graphic, 96 - MovDelay[jx][jy]);
+#endif
 
     if (game.emulation == EMU_SUPAPLEX)
-      DrawGraphic(sx, sy, GFX_SP_DISK_RED);
+      DrawGraphic(sx, sy, GFX_SP_DISK_RED, 0);
     else
-      DrawGraphicThruMask(sx, sy, graphic + phase);
+      DrawGraphicThruMask(sx, sy, graphic, frame);
   }
 
   if (player_is_moving && last_element == EL_EXPLOSION)
   {
-    int phase = Frame[last_jx][last_jy];
-    int delay = 2;
+    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 = Frame[last_jx][last_jy] - 1;
+    int frame = getGraphicAnimationFrame(graphic, phase - delay);
 
-    if (phase > 2)
-      DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy),
-			  GFX_EXPLOSION + ((phase - 1) / delay - 1));
+    if (phase >= delay)
+      DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame);
   }
 
   /* 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);
@@ -686,118 +768,26 @@ void DrawPlayer(struct PlayerInfo *player)
   MarkTileDirty(sx,sy);
 }
 
-static int getGraphicAnimationPhase(int frames, int delay, int mode)
-{
-  int phase;
-
-  if (mode == ANIM_PINGPONG)
-  {
-    int max_anim_frames = 2 * frames - 2;
-
-    phase = (FrameCounter % (delay * max_anim_frames)) / delay;
-    phase = (phase < frames ? phase : max_anim_frames - phase);
-  }
-  else
-    phase = (FrameCounter % (delay * frames)) / delay;
-
-  if (mode == ANIM_REVERSE)
-    phase = -phase;
-
-  return phase;
-}
-
-static int getNewGraphicAnimationFrame(int graphic, int sync_frame)
+void DrawGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
 {
-  int num_frames = new_graphic_info[graphic].anim_frames;
-  int delay = new_graphic_info[graphic].anim_delay;
-  int mode = new_graphic_info[graphic].anim_mode;
-  int frame;
-
-  /* animation synchronized with global frame counter, not move position */
-  if (new_graphic_info[graphic].anim_global_sync || sync_frame < 0)
-    sync_frame = FrameCounter;
-
-  if (mode & ANIM_PINGPONG)		/* use border frames once */
+  if (IN_SCR_FIELD(x, y))
   {
-    int max_anim_frames = 2 * num_frames - 2;
-
-    frame = (sync_frame % (delay * max_anim_frames)) / delay;
-    frame = (frame < num_frames ? frame : max_anim_frames - frame);
-  }
-  else if (mode & ANIM_PINGPONG2)	/* use border frames twice */
-  {
-    int max_anim_frames = 2 * num_frames;
-
-    frame = (sync_frame % (delay * max_anim_frames)) / delay;
-    frame = (frame < num_frames ? frame : max_anim_frames - frame - 1);
-  }
-  else	/* mode == ANIM_NORMAL || mode == ANIM_REVERSE */
-    frame = (sync_frame % (delay * num_frames)) / delay;
-
-  if (mode & ANIM_REVERSE)		/* use reverse animation direction */
-    frame = num_frames - frame - 1;
-
-  return frame;
-}
-
-void DrawGraphicAnimationExt(int x, int y, int graphic,
-			     int frames, int delay, int mode, int mask_mode)
-{
-  int phase = getGraphicAnimationPhase(frames, delay, mode);
-
-  if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-  {
-    if (mask_mode == USE_MASKING)
-      DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic + phase);
-    else
-      DrawGraphic(SCREENX(x), SCREENY(y), graphic + phase);
-  }
-}
-
-void DrawNewGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
-{
-  int delay = new_graphic_info[graphic].anim_delay;
-
-  if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-  {
-    int frame = getNewGraphicAnimationFrame(graphic, -1);
+    int frame = getGraphicAnimationFrame(graphic, -1);
 
     if (mask_mode == USE_MASKING)
-      DrawNewGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame);
+      DrawGraphicThruMask(x, y, graphic, frame);
     else
-      DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame);
+      DrawGraphic(x, y, graphic, frame);
   }
 }
 
-void DrawGraphicAnimation(int x, int y, int graphic,
-			  int frames, int delay, int mode)
-{
-  DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, NO_MASKING);
-}
-
-void DrawNewGraphicAnimation(int x, int y, int graphic)
-{
-  DrawNewGraphicAnimationExt(x, y, graphic, NO_MASKING);
-}
-
-void DrawGraphicAnimationThruMask(int x, int y, int graphic,
-				  int frames, int delay, int mode)
-{
-  DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, USE_MASKING);
-}
-
-static void DrawGraphicAnimationShiftedThruMask(int sx, int sy,
-						int sxx, int syy,
-						int graphic,
-						int frames, int delay,
-						int mode)
+void DrawGraphicAnimation(int x, int y, int graphic)
 {
-  int phase = getGraphicAnimationPhase(frames, delay, mode);
-
-  DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic + phase, NO_CUTTING);
+  DrawGraphicAnimationExt(x, y, graphic, NO_MASKING);
 }
 
-void getGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
+#if 1
+void getOldGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
   if (graphic >= 0 && graphic_info[graphic].bitmap != NULL)
   {
@@ -809,124 +799,116 @@ void getGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 	   graphic <= GFX_END_ROCKSELEMENTS)
   {
     graphic -= GFX_START_ROCKSELEMENTS;
-    *bitmap = pix[PIX_ELEMENTS];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_ELEMENTS].bitmap;
     *x = (graphic % GFX_PER_LINE) * TILEX;
     *y = (graphic / GFX_PER_LINE) * TILEY;
   }
   else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
   {
     graphic -= GFX_START_ROCKSHEROES;
-    *bitmap = pix[PIX_HEROES];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_HEROES].bitmap;
     *x = (graphic % HEROES_PER_LINE) * TILEX;
     *y = (graphic / HEROES_PER_LINE) * TILEY;
   }
   else if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
   {
     graphic -= GFX_START_ROCKSSP;
-    *bitmap = pix[PIX_SP];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_SP].bitmap;
     *x = (graphic % SP_PER_LINE) * TILEX;
     *y = (graphic / SP_PER_LINE) * TILEY;
   }
   else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
   {
     graphic -= GFX_START_ROCKSDC;
-    *bitmap = pix[PIX_DC];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_DC].bitmap;
     *x = (graphic % DC_PER_LINE) * TILEX;
     *y = (graphic / DC_PER_LINE) * TILEY;
   }
   else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
   {
     graphic -= GFX_START_ROCKSMORE;
-    *bitmap = pix[PIX_MORE];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_MORE].bitmap;
     *x = (graphic % MORE_PER_LINE) * TILEX;
     *y = (graphic / MORE_PER_LINE) * TILEY;
   }
   else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
   {
     graphic -= GFX_START_ROCKSFONT;
-    *bitmap = pix[PIX_FONT_EM];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_FONT_EM].bitmap;
     *x = (graphic % FONT_CHARS_PER_LINE) * TILEX;
     *y = (graphic / FONT_CHARS_PER_LINE) * TILEY;
   }
   else
   {
-    *bitmap = pix[PIX_SP];
+    *bitmap = new_graphic_info[IMG_OLD_PIX_SP].bitmap;
     *x = 0;
     *y = 0;
   }
 }
+#endif
 
-void DrawGraphic(int x, int y, int graphic)
+void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y)
 {
-#if DEBUG
-  if (!IN_SCR_FIELD(x, y))
-  {
-    printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic);
-    printf("DrawGraphic(): This should never happen!\n");
-    return;
-  }
-#endif
+  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
+  int offset_x = new_graphic_info[graphic].offset_x;
+  int offset_y = new_graphic_info[graphic].offset_y;
+  int src_x = new_graphic_info[graphic].src_x + frame * offset_x;
+  int src_y = new_graphic_info[graphic].src_y + frame * offset_y;
 
-  DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic);
-  MarkTileDirty(x, y);
+  *bitmap = src_bitmap;
+  *x = src_x;
+  *y = src_y;
 }
 
-void DrawNewGraphic(int x, int y, int graphic, int frame)
+void DrawGraphic(int x, int y, int graphic, int frame)
 {
 #if DEBUG
   if (!IN_SCR_FIELD(x, y))
   {
-    printf("DrawNewGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic);
-    printf("DrawNewGraphic(): This should never happen!\n");
+    printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic);
+    printf("DrawGraphic(): This should never happen!\n");
     return;
   }
 #endif
 
-  DrawNewGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
-		    graphic, frame);
+  DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame);
   MarkTileDirty(x, y);
 }
 
-void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic)
+#if 1
+void DrawOldGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic)
 {
   Bitmap *src_bitmap;
   int src_x, src_y;
 
-  getGraphicSource(graphic, &src_bitmap, &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 DrawNewGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
-		       int frame)
+void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
+		    int frame)
 {
+#if 1
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+
+  getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+#else
   Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
   int src_x = new_graphic_info[graphic].src_x;
   int src_y = new_graphic_info[graphic].src_y;
+  int offset_x = new_graphic_info[graphic].offset_x;
+  int offset_y = new_graphic_info[graphic].offset_y;
 
-  if (new_graphic_info[graphic].anim_vertical)
-    src_y += frame * TILEY;
-  else
-    src_x += frame * TILEX;
-
-  BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
-}
-
-void DrawGraphicThruMask(int x, int y, int graphic)
-{
-#if DEBUG
-  if (!IN_SCR_FIELD(x, y))
-  {
-    printf("DrawGraphicThruMask(): x = %d,y = %d, graphic = %d\n",x,y,graphic);
-    printf("DrawGraphicThruMask(): This should never happen!\n");
-    return;
-  }
+  src_x += frame * offset_x;
+  src_y += frame * offset_y;
 #endif
 
-  DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic);
-  MarkTileDirty(x, y);
+  BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
 }
 
-void DrawNewGraphicThruMask(int x, int y, int graphic, int frame)
+void DrawGraphicThruMask(int x, int y, int graphic, int frame)
 {
 #if DEBUG
   if (!IN_SCR_FIELD(x, y))
@@ -937,57 +919,33 @@ void DrawNewGraphicThruMask(int x, int y, int graphic, int frame)
   }
 #endif
 
-  DrawNewGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY,
-			    graphic, frame);
+  DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic,
+			 frame);
   MarkTileDirty(x, y);
 }
 
-void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic)
+void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic,
+			    int frame)
 {
-  int tile = graphic;
-  int src_x, src_y;
+#if 1
   Bitmap *src_bitmap;
+  int src_x, src_y;
   GC drawing_gc;
 
-  if (graphic == GFX_LEERRAUM)
-    return;
-
-  getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+  getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
   drawing_gc = src_bitmap->stored_clip_gc;
-
-  if (tile_clipmask[tile] != None)
-  {
-    SetClipMask(src_bitmap, tile_clip_gc, tile_clipmask[tile]);
-    SetClipOrigin(src_bitmap, tile_clip_gc, dest_x, dest_y);
-    BlitBitmapMasked(src_bitmap, d,
-		     src_x, src_y, TILEX, TILEY, dest_x, dest_y);
-  }
-  else
-  {
-#if DEBUG
-#ifndef TARGET_SDL
-    printf("DrawGraphicThruMask(): tile '%d' needs clipping!\n", tile);
-#endif
-#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 DrawNewGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y,
-			       int graphic, int frame)
-{
-  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
+#else
   GC drawing_gc = src_bitmap->stored_clip_gc;
+  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
   int src_x = new_graphic_info[graphic].src_x;
   int src_y = new_graphic_info[graphic].src_y;
+  int offset_x = new_graphic_info[graphic].offset_x;
+  int offset_y = new_graphic_info[graphic].offset_y;
 
-  if (new_graphic_info[graphic].anim_vertical)
-    src_y += frame * TILEY;
-  else
-    src_x += frame * TILEX;
+  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);
@@ -995,198 +953,41 @@ void DrawNewGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y,
 
 void DrawMiniGraphic(int x, int y, int graphic)
 {
-  DrawMiniGraphicExt(drawto, SX + x*MINI_TILEX, SY + y*MINI_TILEY, graphic);
-  MarkTileDirty(x/2, y/2);
+  DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic);
+  MarkTileDirty(x / 2, y / 2);
 }
 
 void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
-  if (graphic >= GFX_START_ROCKSELEMENTS && graphic <= GFX_END_ROCKSELEMENTS)
-  {
-    graphic -= GFX_START_ROCKSELEMENTS;
-    *bitmap = pix[PIX_ELEMENTS];
-    *x = MINI_GFX_STARTX + (graphic % MINI_GFX_PER_LINE) * MINI_TILEX;
-    *y = MINI_GFX_STARTY + (graphic / MINI_GFX_PER_LINE) * MINI_TILEY;
-  }
-  else if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
-  {
-    graphic -= GFX_START_ROCKSSP;
-    *bitmap = pix[PIX_SP];
-    *x = MINI_SP_STARTX + (graphic % MINI_SP_PER_LINE) * MINI_TILEX;
-    *y = MINI_SP_STARTY + (graphic / MINI_SP_PER_LINE) * MINI_TILEY;
-  }
-  else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
-  {
-    graphic -= GFX_START_ROCKSDC;
-    *bitmap = pix[PIX_DC];
-    *x = MINI_DC_STARTX + (graphic % MINI_DC_PER_LINE) * MINI_TILEX;
-    *y = MINI_DC_STARTY + (graphic / MINI_DC_PER_LINE) * MINI_TILEY;
-  }
-  else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
-  {
-    graphic -= GFX_START_ROCKSMORE;
-    *bitmap = pix[PIX_MORE];
-    *x = MINI_MORE_STARTX + (graphic % MINI_MORE_PER_LINE) * MINI_TILEX;
-    *y = MINI_MORE_STARTY + (graphic / MINI_MORE_PER_LINE) * MINI_TILEY;
-  }
-  else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
-  {
-    graphic -= GFX_START_ROCKSFONT;
-    *bitmap = pix[PIX_FONT_EM];
-    *x = MINI_FONT_STARTX + (graphic % FONT_CHARS_PER_LINE) * FONT4_XSIZE;
-    *y = MINI_FONT_STARTY + (graphic / FONT_CHARS_PER_LINE) * FONT4_YSIZE;
-  }
-  else
-  {
-    *bitmap = pix[PIX_SP];
-    *x = MINI_SP_STARTX;
-    *y = MINI_SP_STARTY;
-  }
-}
-
-void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
-{
-  Bitmap *bitmap;
-  int src_x, src_y;
+  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
+  int mini_startx = 0;
+  int mini_starty = src_bitmap->height * 2 / 3;
+  int src_x = mini_startx + new_graphic_info[graphic].src_x / 2;
+  int src_y = mini_starty + new_graphic_info[graphic].src_y / 2;
 
-  getMiniGraphicSource(graphic, &bitmap, &src_x, &src_y);
-  BlitBitmap(bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
+  *bitmap = src_bitmap;
+  *x = src_x;
+  *y = src_y;
 }
 
-void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
-			int cut_mode, int mask_mode)
+void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
 {
-  int width = TILEX, height = TILEY;
-  int cx = 0, cy = 0;
-  int src_x, src_y, dest_x, dest_y;
-  int tile = graphic;
   Bitmap *src_bitmap;
-  GC drawing_gc;
-
-  if (graphic < 0)
-  {
-    DrawGraphic(x, y, graphic);
-    return;
-  }
-
-  if (dx || dy)			/* Verschiebung der Grafik? */
-  {
-    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);
-
-    if (y < BY1)		/* Element kommt von oben ins Bild */
-    {
-      if (cut_mode==CUT_BELOW)	/* Element oberhalb des Bildes */
-	return;
-
-      y = BY1;
-      height = dy;
-      cy = TILEY - dy;
-      dy = 0;
-    }
-    else if (y > BY2)		/* Element kommt von unten ins Bild */
-    {
-      y = BY2;
-      height = -dy;
-      dy = TILEY + dy;
-    }
-    else if (y==BY1 && dy < 0)	/* Element verläßt oben das Bild */
-    {
-      height += dy;
-      cy = -dy;
-      dy = 0;
-    }
-    else if (dy > 0 && cut_mode == CUT_ABOVE)
-    {
-      if (y == BY2)		/* Element unterhalb des Bildes */
-	return;
-
-      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));
-  }
-
-  getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
-  drawing_gc = src_bitmap->stored_clip_gc;
-
-  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))
-  {
-    printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
-    printf("DrawGraphicShifted(): This should never happen!\n");
-    return;
-  }
-#endif
-
-  if (mask_mode == USE_MASKING)
-  {
-    if (tile_clipmask[tile] != None)
-    {
-      SetClipMask(src_bitmap, tile_clip_gc, tile_clipmask[tile]);
-      SetClipOrigin(src_bitmap, tile_clip_gc, dest_x, dest_y);
-      BlitBitmapMasked(src_bitmap, drawto_field,
-		       src_x, src_y, TILEX, TILEY, dest_x, dest_y);
-    }
-    else
-    {
-#if DEBUG
-#ifndef	TARGET_SDL
-      printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile);
-#endif
-#endif
-
-      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
-    BlitBitmap(src_bitmap, drawto_field,
-	       src_x, src_y, width, height, dest_x, dest_y);
+  int src_x, src_y;
 
-  MarkTileDirty(x,y);
+  getMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+  BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
 }
 
-void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
+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;
@@ -1194,39 +995,39 @@ void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
 
   if (graphic < 0)
   {
-    DrawNewGraphic(x, y, graphic, frame);
+    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;
@@ -1234,13 +1035,13 @@ void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
       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;
@@ -1248,29 +1049,30 @@ void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
     }
     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;
       dy = TILEY;
       MarkTileDirty(x, y + 1);
-    }				/* Element verläßt unten das Bild */
+    }				/* 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));
   }
 
   src_bitmap = new_graphic_info[graphic].bitmap;
-  drawing_gc = src_bitmap->stored_clip_gc;
   src_x = new_graphic_info[graphic].src_x;
   src_y = new_graphic_info[graphic].src_y;
+  offset_x = new_graphic_info[graphic].offset_x;
+  offset_y = new_graphic_info[graphic].offset_y;
 
-  if (new_graphic_info[graphic].anim_vertical)
-    src_y += frame * TILEY;
-  else
-    src_x += frame * TILEX;
+  drawing_gc = src_bitmap->stored_clip_gc;
+
+  src_x += frame * offset_x;
+  src_y += frame * offset_y;
 
   src_x += cx;
   src_y += cy;
@@ -1279,205 +1081,45 @@ void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
   dest_y = FY + y * TILEY + dy;
 
 #if DEBUG
-  if (!IN_SCR_FIELD(x,y))
-  {
-    printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
-    printf("DrawGraphicShifted(): This should never happen!\n");
-    return;
-  }
-#endif
-
-  if (mask_mode == USE_MASKING)
-    SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
-
-  BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
-	     dest_x, dest_y);
-
-  MarkTileDirty(x,y);
-}
-
-void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
-				int cut_mode)
-{
-  DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, USE_MASKING);
-}
-
-void DrawNewGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
-				   int frame, int cut_mode)
-{
-  DrawNewGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING);
-}
-
-void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
-			  int cut_mode, int mask_mode)
-{
-  int ux = LEVELX(x), uy = LEVELY(y);
-  int graphic = el2gfx(element);
-  int phase8 = ABS(MovPos[ux][uy]) / (TILEX / 8);
-  int phase4 = phase8 / 2;
-  int phase2  = phase8 / 4;
-  int dir = MovDir[ux][uy];
-
-  if (element == EL_PACMAN || element == EL_BUG || element == EL_SPACESHIP)
-  {
-    graphic += 1 * !phase2;
-
-    if (dir == MV_UP)
-      graphic += 1 * 2;
-    else if (dir == MV_LEFT)
-      graphic += 2 * 2;
-    else if (dir == MV_DOWN)
-      graphic += 3 * 2;
-  }
-  else if (element == EL_SP_SNIKSNAK)
-  {
-    if (dir == MV_LEFT)
-      graphic = GFX_SP_SNIKSNAK_LEFT;
-    else if (dir == MV_RIGHT)
-      graphic = GFX_SP_SNIKSNAK_RIGHT;
-    else if (dir == MV_UP)
-      graphic = GFX_SP_SNIKSNAK_UP;
-    else
-      graphic = GFX_SP_SNIKSNAK_DOWN;
-
-    graphic += (phase8 < 4 ? phase8 : 7 - phase8);
-  }
-  else if (element == EL_SP_ELECTRON)
-  {
-    graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
-  }
-  else if (element == EL_MOLE || element == EL_PENGUIN ||
-	   element == EL_PIG || element == EL_DRAGON)
-  {
-    if (dir == MV_LEFT)
-      graphic = (element == EL_MOLE ? GFX_MOLE_LEFT :
-		 element == EL_PENGUIN ? GFX_PINGUIN_LEFT :
-		 element == EL_PIG ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
-    else if (dir == MV_RIGHT)
-      graphic = (element == EL_MOLE ? GFX_MOLE_RIGHT :
-		 element == EL_PENGUIN ? GFX_PINGUIN_RIGHT :
-		 element == EL_PIG ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
-    else if (dir == MV_UP)
-      graphic = (element == EL_MOLE ? GFX_MOLE_UP :
-		 element == EL_PENGUIN ? GFX_PINGUIN_UP :
-		 element == EL_PIG ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
-    else
-      graphic = (element == EL_MOLE ? GFX_MOLE_DOWN :
-		 element == EL_PENGUIN ? GFX_PINGUIN_DOWN :
-		 element == EL_PIG ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
-
-    graphic += phase4;
-  }
-  else if (element == EL_SATELLITE)
-  {
-    graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
-  }
-  else if (element == EL_ACID)
-  {
-    graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_NORMAL);
-  }
-  else if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY)
-  {
-    graphic += !phase2;
-  }
-  else if (element == EL_BALLOON)
-  {
-    graphic += phase4;
-  }
-  else if ((element == EL_ROCK ||
-	    element == EL_SP_ZONK ||
-	    element == EL_BD_ROCK ||
-	    element == EL_SP_INFOTRON ||
-	    IS_GEM(element))
-	   && !cut_mode)
-  {
-    if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
-    {
-      if (element == EL_ROCK ||
-	  element == EL_SP_ZONK ||
-	  element == EL_BD_ROCK)
-      {
-	if (dir == MV_LEFT)
-	  graphic += (4 - phase4) % 4;
-	else if (dir == MV_RIGHT)
-	  graphic += phase4;
-	else
-	  graphic += phase2 * 2;
-      }
-      else if (element != EL_SP_INFOTRON)
-	graphic += phase2;
-    }
-  }
-  else if (element == EL_MAGIC_WALL_ACTIVE ||
-	   element == EL_MAGIC_WALL_EMPTYING ||
-	   element == EL_BD_MAGIC_WALL_ACTIVE ||
-	   element == EL_BD_MAGIC_WALL_EMPTYING ||
-	   element == EL_MAGIC_WALL_FULL ||
-	   element == EL_BD_MAGIC_WALL_FULL)
-  {
-    graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
-  }
-  else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
-  {
-    graphic = (element == EL_AMOEBA_DEAD ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
-    graphic += (x + 2 * y + 4) % 4;
-  }
-  else if (element == EL_WALL_GROWING)
-  {
-    boolean 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;
-
-    if (links_massiv && rechts_massiv)
-      graphic = GFX_MAUERWERK;
-    else if (links_massiv)
-      graphic = GFX_MAUER_R;
-    else if (rechts_massiv)
-      graphic = GFX_MAUER_L;
-  }
-#if 0
-  else if ((element == EL_INVISIBLE_STEELWALL ||
-	    element == EL_INVISIBLE_WALL ||
-	    element == EL_INVISIBLE_SAND) && game.light_time_left)
-  {
-    graphic = (element == EL_INVISIBLE_STEELWALL ? GFX_INVISIBLE_STEEL_ON :
-	       element == EL_INVISIBLE_WALL ? GFX_UNSICHTBAR_ON :
-	       GFX_SAND_INVISIBLE_ON);
+  if (!IN_SCR_FIELD(x,y))
+  {
+    printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
+    printf("DrawGraphicShifted(): This should never happen!\n");
+    return;
   }
 #endif
 
-  if (dx || dy)
-    DrawGraphicShifted(x, y, dx, dy, graphic, cut_mode, mask_mode);
-  else if (mask_mode == USE_MASKING)
-    DrawGraphicThruMask(x, y, graphic);
+  if (mask_mode == USE_MASKING)
+  {
+    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
-    DrawGraphic(x, y, graphic);
+    BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
+	       dest_x, dest_y);
+
+  MarkTileDirty(x,y);
 }
 
-void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
+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);
+}
+
+#if 0
+void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
 			  int cut_mode, int mask_mode)
 {
   int ux = LEVELX(x), uy = LEVELY(y);
-  int move_dir = MovDir[ux][uy];
-  int move_pos = ABS(MovPos[ux][uy]) / (TILEX / 8);
-  int graphic = el_dir2img(element, move_dir);
-  int frame = getNewGraphicAnimationFrame(graphic, move_pos);
-  int phase8 = move_pos;
+  int graphic = el2gfx(element);
+  int phase8 = ABS(MovPos[ux][uy]) / (TILEX / 8);
   int phase4 = phase8 / 2;
   int phase2  = phase8 / 4;
+  int dir = MovDir[ux][uy];
 
-  int dir = move_dir;	/* !!! THROW AWAY LATER !!! */
-
-  if (0)
-  {
-    ;
-  }
-#if 0
-  else if (element == EL_PACMAN || element == EL_BUG ||
-	   element == EL_SPACESHIP)
+  if (element == EL_PACMAN || element == EL_BUG || element == EL_SPACESHIP)
   {
     graphic += 1 * !phase2;
 
@@ -1503,9 +1145,8 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
   }
   else if (element == EL_SP_ELECTRON)
   {
-    graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
+    graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_LOOP);
   }
-#endif
   else if (element == EL_MOLE || element == EL_PENGUIN ||
 	   element == EL_PIG || element == EL_DRAGON)
   {
@@ -1530,19 +1171,11 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
   }
   else if (element == EL_SATELLITE)
   {
-#if 1
-    graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
-#else
-    graphic = GFX_SONDE_START + getNewGraphicAnimationFrame(graphic, move_pos);
-#endif
+    graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_LOOP);
   }
   else if (element == EL_ACID)
   {
-#if 1
-    graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_NORMAL);
-#else
-    graphic = GFX_GEBLUBBER + getNewGraphicAnimationFrame(graphic, move_pos);
-#endif
+    graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_LOOP);
   }
   else if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY)
   {
@@ -1583,11 +1216,7 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
 	   element == EL_MAGIC_WALL_FULL ||
 	   element == EL_BD_MAGIC_WALL_FULL)
   {
-#if 1
     graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
-#else
-    graphic += 3 + getNewGraphicAnimationFrame(graphic, move_pos);
-#endif
   }
   else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
   {
@@ -1622,26 +1251,105 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
 #endif
 
   if (dx || dy)
-    DrawNewGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
+    DrawGraphicShifted(x, y, dx, dy, graphic, cut_mode, mask_mode);
   else if (mask_mode == USE_MASKING)
-    DrawNewGraphicThruMask(x, y, graphic, frame);
+    DrawGraphicThruMask(x, y, graphic);
   else
-    DrawNewGraphic(x, y, graphic, frame);
+    DrawGraphic(x, y, graphic);
 }
+#endif
 
-void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
-			 int cut_mode, int mask_mode)
+inline static int getFramePosition(int x, int y)
 {
-  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);
+  int frame_pos = -1;		/* default: global synchronization */
+#if 0
+  int element = Feld[x][y];
+
+  if (element == EL_QUICKSAND_FULL ||
+      element == EL_MAGIC_WALL_FULL ||
+      element == EL_BD_MAGIC_WALL_FULL)
+    frame_pos = -1;
+  else if (IS_MOVING(x, y) || CAN_MOVE(element) || CAN_FALL(element))
+    frame_pos = ABS(MovPos[x][y]) / (TILEX / 8);
+#else
+  frame_pos = ABS(MovPos[x][y]) / (TILEX / 8);
+#endif
+
+  return frame_pos;
+}
+
+inline static int getGfxAction(int x, int y)
+{
+  int gfx_action = GFX_ACTION_DEFAULT;
+
+#if 0
+  if (GfxAction[x][y] != GFX_ACTION_DEFAULT)
+    gfx_action = GfxAction[x][y];
+  else if (IS_MOVING(x, y))
+    gfx_action = GFX_ACTION_MOVING;
+#else
+  gfx_action = GfxAction[x][y];
+#endif
+
+  return gfx_action;
+}
+
+void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
+			  int cut_mode, int mask_mode)
+{
+  int ux = LEVELX(x), uy = LEVELY(y);
+  int move_dir = MovDir[ux][uy];
+  int move_pos = getFramePosition(ux, uy);
+  int gfx_action = getGfxAction(ux, uy);
+  int graphic = el_dir_act2img(element, move_dir, gfx_action);
+  int frame = getGraphicAnimationFrame(graphic, move_pos);
+
+  if (element == EL_WALL_GROWING)
+  {
+    boolean left_stopped = FALSE, right_stopped = FALSE;
+
+    if (!IN_LEV_FIELD(ux - 1, uy) || IS_MAUER(Feld[ux - 1][uy]))
+      left_stopped = TRUE;
+    if (!IN_LEV_FIELD(ux + 1, uy) || IS_MAUER(Feld[ux + 1][uy]))
+      right_stopped = TRUE;
+
+    if (left_stopped && right_stopped)
+      graphic = IMG_WALL;
+    else if (left_stopped)
+    {
+      graphic = IMG_WALL_GROWING_ACTIVE_RIGHT;
+      frame = new_graphic_info[graphic].anim_frames - 1;
+    }
+    else if (right_stopped)
+    {
+      graphic = IMG_WALL_GROWING_ACTIVE_LEFT;
+      frame = new_graphic_info[graphic].anim_frames - 1;
+    }
+  }
+  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);
+
+    graphic += (x + 2 * y + 4) % 4;
+  }
+
+  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);
 }
 
-void DrawNewLevelElementExt(int x, int y, int dx, int dy, int element,
+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)))
-    DrawNewScreenElementExt(SCREENX(x), SCREENY(y), dx, dy, element,
+    DrawScreenElementExt(SCREENX(x), SCREENY(y), dx, dy, element,
 			 cut_mode, mask_mode);
 }
 
@@ -1651,55 +1359,35 @@ void DrawScreenElementShifted(int x, int y, int dx, int dy, int element,
   DrawScreenElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
 }
 
-void DrawNewScreenElementShifted(int x, int y, int dx, int dy, int element,
-			      int cut_mode)
-{
-  DrawNewScreenElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
-}
-
 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);
 }
 
-void DrawNewLevelElementShifted(int x, int y, int dx, int dy, int element,
-			     int cut_mode)
+#if 0
+void DrawOldScreenElementThruMask(int x, int y, int element)
 {
-  DrawNewLevelElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
+  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);
 }
-
-void DrawNewScreenElementThruMask(int x, int y, int element)
-{
-  DrawNewScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
-}
+#endif
 
 void DrawLevelElementThruMask(int x, int y, int element)
 {
   DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
 }
 
-void DrawNewLevelElementThruMask(int x, int y, int element)
-{
-  DrawNewLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
-}
-
 void DrawLevelFieldThruMask(int x, int y)
 {
   DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING);
 }
 
-void DrawNewLevelFieldThruMask(int x, int y)
-{
-  DrawNewLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING);
-}
-
-void ErdreichAnbroeckeln(int x, int y)
+void DrawCrumbledSand(int x, int y)
 {
   Bitmap *src_bitmap;
   int src_x, src_y;
@@ -1728,9 +1416,11 @@ void ErdreichAnbroeckeln(int x, int y)
     if (!IN_SCR_FIELD(x, y))
       return;
 
-    graphic = GFX_ERDENRAND;
+    graphic = IMG_SAND_CRUMBLED;
 
-    getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+    src_bitmap = new_graphic_info[graphic].bitmap;
+    src_x = new_graphic_info[graphic].src_x;
+    src_y = new_graphic_info[graphic].src_y;
 
     for(i=0; i<4; i++)
     {
@@ -1772,9 +1462,11 @@ void ErdreichAnbroeckeln(int x, int y)
   }
   else
   {
-    graphic = GFX_ERDENRAND;
+    graphic = IMG_SAND_CRUMBLED;
 
-    getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+    src_bitmap = new_graphic_info[graphic].bitmap;
+    src_x = new_graphic_info[graphic].src_x;
+    src_y = new_graphic_info[graphic].src_y;
 
     for(i=0; i<4; i++)
     {
@@ -1819,13 +1511,7 @@ void ErdreichAnbroeckeln(int x, int y)
 void DrawScreenElement(int x, int y, int element)
 {
   DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
-  ErdreichAnbroeckeln(x, y);
-}
-
-void DrawNewScreenElement(int x, int y, int element)
-{
-  DrawNewScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
-  ErdreichAnbroeckeln(x, y);
+  DrawCrumbledSand(x, y);
 }
 
 void DrawLevelElement(int x, int y, int element)
@@ -1834,12 +1520,6 @@ void DrawLevelElement(int x, int y, int element)
     DrawScreenElement(SCREENX(x), SCREENY(y), element);
 }
 
-void DrawNewLevelElement(int x, int y, int element)
-{
-  if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    DrawNewScreenElement(SCREENX(x), SCREENY(y), element);
-}
-
 void DrawScreenField(int x, int y)
 {
   int ux = LEVELX(x), uy = LEVELY(y);
@@ -1930,96 +1610,6 @@ void DrawScreenField(int x, int y)
     DrawScreenElement(x, y, EL_EMPTY);
 }
 
-void DrawNewScreenField(int x, int y)
-{
-  int ux = LEVELX(x), uy = LEVELY(y);
-  int element, content;
-
-  if (!IN_LEV_FIELD(ux, uy))
-  {
-    if (ux < -1 || ux > lev_fieldx || uy < -1 || uy > lev_fieldy)
-      element = EL_EMPTY;
-    else
-      element = BorderElement;
-
-    DrawNewScreenElement(x, y, element);
-    return;
-  }
-
-  element = Feld[ux][uy];
-  content = Store[ux][uy];
-
-  if (IS_MOVING(ux, uy))
-  {
-    int horiz_move = (MovDir[ux][uy] == MV_LEFT || MovDir[ux][uy] == MV_RIGHT);
-    boolean cut_mode = NO_CUTTING;
-
-    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 (element == EL_QUICKSAND_FILLING ||
-	     element == EL_MAGIC_WALL_FILLING ||
-	     element == EL_BD_MAGIC_WALL_FILLING)
-      cut_mode = CUT_BELOW;
-
-    if (cut_mode == CUT_ABOVE)
-      DrawNewScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
-    else
-      DrawNewScreenElement(x, y, EL_EMPTY);
-
-    if (horiz_move)
-      DrawNewScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
-    else if (cut_mode == NO_CUTTING)
-      DrawNewScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
-    else
-      DrawNewScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
-
-    if (content == EL_ACID)
-      DrawNewLevelElementThruMask(ux, uy + 1, EL_ACID);
-  }
-  else if (IS_BLOCKED(ux, uy))
-  {
-    int oldx, oldy;
-    int sx, sy;
-    int horiz_move;
-    boolean cut_mode = NO_CUTTING;
-    int element_old, content_old;
-
-    Blocked2Moving(ux, uy, &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;
-
-    DrawNewScreenElement(x, y, EL_EMPTY);
-
-    if (horiz_move)
-      DrawNewScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
-			       NO_CUTTING);
-    else if (cut_mode == NO_CUTTING)
-      DrawNewScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old,
-			       cut_mode);
-    else
-      DrawNewScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old,
-			       cut_mode);
-  }
-  else if (IS_DRAWABLE(element))
-    DrawNewScreenElement(x, y, element);
-  else
-    DrawNewScreenElement(x, y, EL_EMPTY);
-}
-
 void DrawLevelField(int x, int y)
 {
   if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
@@ -2042,39 +1632,11 @@ void DrawLevelField(int x, int y)
   }
 }
 
-void DrawNewLevelField(int x, int y)
-{
-  if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-    DrawNewScreenField(SCREENX(x), SCREENY(y));
-  else if (IS_MOVING(x, y))
-  {
-    int newx,newy;
-
-    Moving2Blocked(x, y, &newx, &newy);
-    if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
-      DrawNewScreenField(SCREENX(newx), SCREENY(newy));
-  }
-  else if (IS_BLOCKED(x, y))
-  {
-    int oldx, oldy;
-
-    Blocked2Moving(x, y, &oldx, &oldy);
-    if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy)))
-      DrawNewScreenField(SCREENX(oldx), SCREENY(oldy));
-  }
-}
-
 void DrawMiniElement(int x, int y, int element)
 {
   int graphic;
 
-  if (!element)
-  {
-    DrawMiniGraphic(x, y, -1);
-    return;
-  }
-
-  graphic = el2gfx(element);
+  graphic = el2img(element);
   DrawMiniGraphic(x, y, graphic);
 }
 
@@ -2091,12 +1653,12 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
     int steel_type, steel_position;
     int border[6][2] =
     {
-      { GFX_VSTEEL_UPPER_LEFT,	GFX_ISTEEL_UPPER_LEFT  },
-      { GFX_VSTEEL_UPPER_RIGHT,	GFX_ISTEEL_UPPER_RIGHT },
-      { GFX_VSTEEL_LOWER_LEFT,	GFX_ISTEEL_LOWER_LEFT  },
-      { GFX_VSTEEL_LOWER_RIGHT,	GFX_ISTEEL_LOWER_RIGHT },
-      { GFX_VSTEEL_VERTICAL,	GFX_ISTEEL_VERTICAL    },
-      { GFX_VSTEEL_HORIZONTAL,	GFX_ISTEEL_HORIZONTAL  }
+      { IMG_STEELWALL_TOPLEFT,		IMG_INVISIBLE_STEELWALL_TOPLEFT     },
+      { IMG_STEELWALL_TOPRIGHT,		IMG_INVISIBLE_STEELWALL_TOPRIGHT    },
+      { IMG_STEELWALL_BOTTOMLEFT,	IMG_INVISIBLE_STEELWALL_BOTTOMLEFT  },
+      { IMG_STEELWALL_BOTTOMRIGHT,	IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT },
+      { IMG_STEELWALL_VERTICAL,		IMG_INVISIBLE_STEELWALL_VERTICAL    },
+      { IMG_STEELWALL_HORIZONTAL,	IMG_INVISIBLE_STEELWALL_HORIZONTAL  }
     };
 
     steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
@@ -2112,52 +1674,33 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
   }
 }
 
+void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
+{
+  Bitmap *src_bitmap = new_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 + new_graphic_info[graphic].src_x / 8;
+  int src_y = mini_starty + new_graphic_info[graphic].src_y / 8;
+
+  *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;
 
   if (element == EL_EMPTY)
     return;
 
-  graphic = el2gfx(element);
+  graphic = el2img(element);
 
-  if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
-  {
-    graphic -= GFX_START_ROCKSSP;
-    BlitBitmap(pix[PIX_SP], drawto,
-	       MICRO_SP_STARTX + (graphic % MICRO_SP_PER_LINE) * MICRO_TILEX,
-	       MICRO_SP_STARTY + (graphic / MICRO_SP_PER_LINE) * MICRO_TILEY,
-	       MICRO_TILEX, MICRO_TILEY, xpos, ypos);
-  }
-  else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
-  {
-    graphic -= GFX_START_ROCKSDC;
-    BlitBitmap(pix[PIX_DC], drawto,
-	       MICRO_DC_STARTX + (graphic % MICRO_DC_PER_LINE) * MICRO_TILEX,
-	       MICRO_DC_STARTY + (graphic / MICRO_DC_PER_LINE) * MICRO_TILEY,
-	       MICRO_TILEX, MICRO_TILEY, xpos, ypos);
-  }
-  else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
-  {
-    graphic -= GFX_START_ROCKSMORE;
-    BlitBitmap(pix[PIX_MORE], drawto,
-	       MICRO_MORE_STARTX + (graphic % MICRO_MORE_PER_LINE)*MICRO_TILEX,
-	       MICRO_MORE_STARTY + (graphic / MICRO_MORE_PER_LINE)*MICRO_TILEY,
-	       MICRO_TILEX, MICRO_TILEY, xpos, ypos);
-  }
-  else if (graphic >= GFX_CHAR_START && graphic <= GFX_CHAR_END)
-  {
-    graphic -= GFX_CHAR_START;
-    BlitBitmap(pix[PIX_FONT_EM], drawto,
-	       MICRO_FONT_STARTX + (graphic % MICRO_GFX_PER_LINE)* MICRO_TILEX,
-	       MICRO_FONT_STARTY + (graphic / MICRO_GFX_PER_LINE)* MICRO_TILEY,
-	       MICRO_TILEX, MICRO_TILEY, xpos, ypos);
-  }
-  else
-    BlitBitmap(pix[PIX_ELEMENTS], drawto,
-	       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()
@@ -2377,7 +1920,7 @@ boolean Request(char *text, unsigned int req_state)
   CloseDoor(DOOR_CLOSE_1);
 
   /* save old door content */
-  BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+  BlitBitmap(bitmap_db_door, bitmap_db_door,
 	     DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
 	     DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
 
@@ -2434,7 +1977,7 @@ boolean Request(char *text, unsigned int req_state)
   }
 
   /* copy request gadgets to door backbuffer */
-  BlitBitmap(drawto, pix[PIX_DB_DOOR],
+  BlitBitmap(drawto, bitmap_db_door,
 	     DX, DY, DXSIZE, DYSIZE,
 	     DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
 
@@ -2580,7 +2123,7 @@ boolean Request(char *text, unsigned int req_state)
 
     if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
     {
-      BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+      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);
@@ -2606,7 +2149,7 @@ unsigned int OpenDoor(unsigned int door_state)
 
   if (door_state & DOOR_COPY_BACK)
   {
-    BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+    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;
@@ -2621,9 +2164,9 @@ unsigned int CloseDoor(unsigned int door_state)
 {
   unsigned int new_door_state;
 
-  BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+  BlitBitmap(backbuffer, bitmap_db_door,
 	     DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-  BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+  BlitBitmap(backbuffer, bitmap_db_door,
 	     VX, VY, VXSIZE, VYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
 
   new_door_state = MoveDoor(door_state);
@@ -2694,7 +2237,7 @@ unsigned int MoveDoor(unsigned int door_state)
 
     for(x=start; x<=DXSIZE; x+=stepsize)
     {
-      Bitmap *bitmap = pix[PIX_DOOR];
+      Bitmap *bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
       GC gc = bitmap->stored_clip_gc;
 
       WaitUntilDelayReached(&door_delay, door_delay_value);
@@ -2704,7 +2247,7 @@ unsigned int MoveDoor(unsigned int door_state)
 	int i = (door_state & DOOR_OPEN_1 ? DXSIZE-x : x);
 	int j = (DXSIZE - i) / 3;
 
-	BlitBitmap(pix[PIX_DB_DOOR], drawto,
+	BlitBitmap(bitmap_db_door, drawto,
 		   DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + i/2,
 		   DXSIZE,DYSIZE - i/2, DX, DY);
 
@@ -2747,7 +2290,7 @@ unsigned int MoveDoor(unsigned int door_state)
 	int i = (door_state & DOOR_OPEN_2 ? VXSIZE - x : x);
 	int j = (VXSIZE - i) / 3;
 
-	BlitBitmap(pix[PIX_DB_DOOR], drawto,
+	BlitBitmap(bitmap_db_door, drawto,
 		   DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + i/2,
 		   VXSIZE, VYSIZE - i/2, VX, VY);
 
@@ -2799,7 +2342,7 @@ unsigned int MoveDoor(unsigned int door_state)
 void DrawSpecialEditorDoor()
 {
   /* draw bigger toolbox window */
-  BlitBitmap(pix[PIX_DOOR], drawto,
+  BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX7, 0, 108, 56, EX - 4, EY - 12);
 
   redraw_mask |= REDRAW_ALL;
@@ -2808,7 +2351,7 @@ void DrawSpecialEditorDoor()
 void UndrawSpecialEditorDoor()
 {
   /* draw normal tape recorder window */
-  BlitBitmap(pix[PIX_BACK], drawto,
+  BlitBitmap(new_graphic_info[IMG_MENU_BACK].bitmap, drawto,
 	     562, 344, 108, 56, EX - 4, EY - 12);
 
   redraw_mask |= REDRAW_ALL;
@@ -2937,7 +2480,7 @@ void CreateToolButtons()
 
   for (i=0; i<NUM_TOOL_BUTTONS; i++)
   {
-    Bitmap *gd_bitmap = pix[PIX_DOOR];
+    Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
     Bitmap *deco_bitmap = None;
     int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
     struct GadgetInfo *gi;
@@ -2956,7 +2499,9 @@ void CreateToolButtons()
 
     if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
     {
-      getMiniGraphicSource(GFX_SPIELER1 + id - TOOL_CTRL_ID_PLAYER_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;
@@ -3284,7 +2829,6 @@ int el2gfx_OLD(int element)
     case EL_TUBE_RIGHT_UP:		return GFX_TUBE_RIGHT_UP;
     case EL_TUBE_RIGHT_DOWN:		return GFX_TUBE_RIGHT_DOWN;
     case EL_SPRING:			return GFX_SPRING;
-    case EL_SPRING_MOVING:		return GFX_SPRING;
     case EL_TRAP:			return GFX_TRAP_INACTIVE;
     case EL_TRAP_ACTIVE:		return GFX_TRAP_ACTIVE;
     case EL_BD_WALL:			return GFX_BD_WALL;
@@ -3343,48 +2887,26 @@ int el2gfx(int element)
 
 int el2img(int element)
 {
-#if 1
-  int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
-
-  return graphic_NEW;
-#else
-
-  switch(element)
-  {
-    case EL_BD_BUTTERFLY:	return IMG_BD_BUTTERFLY;
-    case EL_BD_FIREFLY:		return IMG_BD_FIREFLY;
-    case EL_SP_ELECTRON:	return IMG_SP_ELECTRON;
-
-    default:
-      break;
-  }
+  int graphic = element_info[element].graphic[GFX_ACTION_DEFAULT];
 
-  return IMG_EMPTY_SPACE;
+#if DEBUG
+  if (graphic < 0)
+    Error(ERR_WARN, "element %d -> graphic %d -- probably crashing now...",
+	  element, graphic);
 #endif
+
+  return graphic;
 }
 
 int el_dir2img(int element, int direction)
 {
-  int action = GFX_ACTION_DEFAULT;
-
-  if (element_info[element].has_direction_graphic[action])
-  {
-    int direction = MV_DIR_BIT(direction);
-
-    return element_info[element].direction_graphic[action][direction];
-  }
-  else
-    return el2img(element);
+  return el_dir_act2img(element, direction, GFX_ACTION_DEFAULT);
 }
 
 int el_dir_act2img(int element, int direction, int action)
 {
-  if (element_info[element].has_direction_graphic[action])
-  {
-    int direction = MV_DIR_BIT(direction);
+  action = graphics_action_mapping[action];
+  direction = MV_DIR_BIT(direction);
 
-    return element_info[element].direction_graphic[action][direction];
-  }
-  else
-    return el_dir2img(element, direction);
+  return element_info[element].direction_graphic[action][direction];
 }