X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=cfaa4ca2d93130fa1102e2a4fe16f2a357353f3c;hb=a750ba6776fdfb711f5da2e6094c8010cd19645a;hp=eba90f7076c043aca03039fa62c779e27f932728;hpb=88a46f726da49d5ae03e736b1388a4b854221685;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index eba90f70..cfaa4ca2 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -33,8 +33,6 @@
 
 /* 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 *);
 
@@ -442,7 +440,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 +467,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 +519,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 +565,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->index_nr * 3 * HEROES_PER_LINE;
-    graphic += player->Frame;
+    graphic = PLAYER_NR_GFX(graphic, player->index_nr);
+
+#if 0
+    frame = player->Frame;
+#else
+    frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
   }
 
   if (player->GfxPos)
@@ -590,43 +601,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 +675,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);
@@ -706,7 +756,7 @@ static int getGraphicAnimationPhase(int frames, int delay, int mode)
   return phase;
 }
 
-int getNewGraphicAnimationFrame(int graphic, int sync_frame)
+int getGraphicAnimationFrame(int graphic, int sync_frame)
 {
   int num_frames = new_graphic_info[graphic].anim_frames;
   int delay = new_graphic_info[graphic].anim_delay;
@@ -717,6 +767,8 @@ int getNewGraphicAnimationFrame(int graphic, int sync_frame)
   if (new_graphic_info[graphic].anim_global_sync || sync_frame < 0)
     sync_frame = FrameCounter;
 
+  sync_frame += new_graphic_info[graphic].anim_start_frame * delay;
+
   if (mode & ANIM_LOOP)			/* normal, looping animation */
   {
     frame = (sync_frame % (delay * num_frames)) / delay;
@@ -749,21 +801,7 @@ int getNewGraphicAnimationFrame(int graphic, int sync_frame)
   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)
+void DrawGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
 {
 #if 0
   int delay = new_graphic_info[graphic].anim_delay;
@@ -773,44 +811,30 @@ void DrawNewGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
   if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
 #endif
   {
-    int frame = getNewGraphicAnimationFrame(graphic, -1);
+    int frame = getGraphicAnimationFrame(graphic, -1);
 
     if (mask_mode == USE_MASKING)
-      DrawNewGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame);
+      DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame);
     else
-      DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame);
+      DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
   }
 }
 
-void DrawGraphicAnimation(int x, int y, int graphic,
-			  int frames, int delay, int mode)
+#if 0
+void DrawOldGraphicAnimation(int x, int y, int graphic,
+			     int frames, int delay, int mode)
 {
   DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, NO_MASKING);
 }
+#endif
 
-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)
   {
@@ -822,96 +846,102 @@ 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;
@@ -920,26 +950,12 @@ void DrawNewGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
 
   src_x += frame * offset_x;
   src_y += frame * offset_y;
-
-  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;
-  }
 #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))
@@ -950,50 +966,24 @@ 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;
@@ -1002,70 +992,19 @@ void DrawNewGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_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,
-		     SX + x * MINI_TILEX, SY + y * MINI_TILEY, graphic);
-  MarkTileDirty(x / 2, y / 2);
-}
-
-void DrawNewMiniGraphic(int x, int y, int graphic)
-{
-  DrawNewMiniGraphicExt(drawto,
-			SX + x * MINI_TILEX, SY + y * MINI_TILEY, graphic);
+  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 getNewMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
   Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
   int mini_startx = 0;
@@ -1080,159 +1019,14 @@ void getNewMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 
 void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
 {
-  Bitmap *bitmap;
-  int src_x, src_y;
-
-  getMiniGraphicSource(graphic, &bitmap, &src_x, &src_y);
-  BlitBitmap(bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
-}
-
-void DrawNewMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
-{
-#if 1
   Bitmap *src_bitmap;
   int src_x, src_y;
 
-  getNewMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
-#else
-  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
-  int mini_startx = src_bitmap->width  * 2 / 3;
-  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;
-#endif
-
+  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 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 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);
-
-  MarkTileDirty(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;
@@ -1248,39 +1042,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;
@@ -1288,13 +1082,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;
@@ -1302,27 +1096,28 @@ 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;
 
+  drawing_gc = src_bitmap->stored_clip_gc;
+
   src_x += frame * offset_x;
   src_y += frame * offset_y;
 
@@ -1342,26 +1137,25 @@ void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
 #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);
+    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);
 
   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)
+				int frame, int cut_mode)
 {
-  DrawNewGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING);
+  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)
 {
@@ -1510,11 +1304,13 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
   else
     DrawGraphic(x, y, graphic);
 }
+#endif
 
 inline static int getFramePosition(int x, int y)
 {
+  int frame_pos = -1;		/* default: global synchronization */
+#if 0
   int element = Feld[x][y];
-  int frame_pos = -1;
 
   if (element == EL_QUICKSAND_FULL ||
       element == EL_MAGIC_WALL_FULL ||
@@ -1522,6 +1318,9 @@ inline static int getFramePosition(int x, int y)
     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;
 }
@@ -1530,23 +1329,27 @@ 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 DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
-			     int cut_mode, int mask_mode)
+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 = getNewGraphicAnimationFrame(graphic, move_pos);
+  int frame = getGraphicAnimationFrame(graphic, move_pos);
 
   if (element == EL_WALL_GROWING)
   {
@@ -1570,32 +1373,6 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
       frame = new_graphic_info[graphic].anim_frames - 1;
     }
   }
-#if 0
-  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 (move_dir == MV_LEFT)
-	  graphic += (4 - phase4) % 4;
-	else if (move_dir == MV_RIGHT)
-	  graphic += phase4;
-	else
-	  graphic += phase2 * 2;
-      }
-      else if (element != EL_SP_INFOTRON)
-	graphic += phase2;
-    }
-  }
-#endif
   else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
   {
     graphic = (element == EL_BD_AMOEBA ? IMG_BD_AMOEBA_PART1 :
@@ -1608,11 +1385,11 @@ void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
   }
 
   if (dx || dy)
-    DrawNewGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
+    DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
   else if (mask_mode == USE_MASKING)
-    DrawNewGraphicThruMask(x, y, graphic, frame);
+    DrawGraphicThruMask(x, y, graphic, frame);
   else
-    DrawNewGraphic(x, y, graphic, frame);
+    DrawGraphic(x, y, graphic, frame);
 }
 
 void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
@@ -1623,69 +1400,41 @@ void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
 			 cut_mode, mask_mode);
 }
 
-void DrawNewLevelElementExt(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,
-			 cut_mode, mask_mode);
-}
-
 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);
 }
 
-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;
@@ -1714,9 +1463,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++)
     {
@@ -1758,9 +1509,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++)
     {
@@ -1805,13 +1558,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)
@@ -1820,12 +1567,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);
@@ -1916,96 +1657,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)))
@@ -2028,56 +1679,12 @@ 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);
-  DrawMiniGraphic(x, y, graphic);
-}
-
-void DrawNewMiniElement(int x, int y, int element)
-{
-  int graphic;
-
-#if 0
-  if (!element)
-  {
-    DrawNewMiniGraphic(x, y, -1);
-    return;
-  }
-#endif
-
   graphic = el2img(element);
-  DrawNewMiniGraphic(x, y, graphic);
+  DrawMiniGraphic(x, y, graphic);
 }
 
 void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
@@ -2089,40 +1696,6 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
   else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
     DrawMiniElement(sx, sy, Feld[x][y]);
   else
-  {
-    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  }
-    };
-
-    steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
-    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 : -1);
-
-    if (steel_position != -1)
-      DrawMiniGraphic(sx, sy, border[steel_position][steel_type]);
-  }
-}
-
-void DrawNewMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
-{
-  int x = sx + scroll_x, y = sy + scroll_y;
-
-  if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
-    DrawNewMiniElement(sx, sy, EL_EMPTY);
-  else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
-    DrawNewMiniElement(sx, sy, Feld[x][y]);
-  else
   {
     int steel_type, steel_position;
     int border[6][2] =
@@ -2144,56 +1717,37 @@ void DrawNewMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
 		      y == -1 || y == lev_fieldy		? 5 : -1);
 
     if (steel_position != -1)
-      DrawNewMiniGraphic(sx, sy, border[steel_position][steel_type]);
+      DrawMiniGraphic(sx, sy, border[steel_position][steel_type]);
   }
 }
 
+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()
@@ -2204,7 +1758,7 @@ void DrawLevel()
 
   for(x=BX1; x<=BX2; x++)
     for(y=BY1; y<=BY2; y++)
-      DrawNewScreenField(x, y);
+      DrawScreenField(x, y);
 
   redraw_mask |= REDRAW_FIELD;
 }
@@ -2220,17 +1774,6 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
   redraw_mask |= REDRAW_FIELD;
 }
 
-void DrawNewMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
-{
-  int x,y;
-
-  for(x=0; x<size_x; x++)
-    for(y=0; y<size_y; y++)
-      DrawNewMiniElementOrWall(x, y, scroll_x, scroll_y);
-
-  redraw_mask |= REDRAW_FIELD;
-}
-
 static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y)
 {
   int x, y;
@@ -3003,7 +2546,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;
@@ -3331,7 +2876,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;
@@ -3390,30 +2934,15 @@ int el2gfx(int element)
 
 int el2img(int element)
 {
-#if 1
-  int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
+  int graphic = element_info[element].graphic[GFX_ACTION_DEFAULT];
 
 #if DEBUG
-  if (graphic_NEW < 0)
+  if (graphic < 0)
     Error(ERR_WARN, "element %d -> graphic %d -- probably crashing now...",
-	  element, graphic_NEW);
+	  element, graphic);
 #endif
 
-  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;
-  }
-
-  return IMG_EMPTY;
-#endif
+  return graphic;
 }
 
 int el_dir2img(int element, int direction)