X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=cc746c0c399fd44da79edc8d44e5bc458ce7b453;hb=88c9b68c44a16e7df62557b63cc7e86731e028c9;hp=bdb40a02f722216fc250130c90b85ac126d61d82;hpb=bec8906b5a4f4e980037f41a5bd02d77a16aeedf;p=rocksndiamonds.git

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index bdb40a02..cc746c0c 100644
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -16,57 +16,252 @@ unsigned int screen_y;
 static unsigned int screentiles[MAX_BUF_YSIZE][MAX_BUF_XSIZE];
 static unsigned int crumbled_state[MAX_BUF_YSIZE][MAX_BUF_XSIZE];
 
+static boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+
 
 /* copy the entire screen to the window at the scroll position
  *
  * perhaps use mit-shm to speed this up
  */
 
-void blitscreen(void)
+void BlitScreenToBitmap_EM(Bitmap *target_bitmap)
 {
   unsigned int x = screen_x % (MAX_BUF_XSIZE * TILEX);
   unsigned int y = screen_y % (MAX_BUF_YSIZE * TILEY);
 
   if (x < 2 * TILEX && y < 2 * TILEY)
   {
-    BlitBitmap(screenBitmap, window, x, y,
+    BlitBitmap(screenBitmap, target_bitmap, x, y,
 	       SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY);
   }
   else if (x < 2 * TILEX && y >= 2 * TILEY)
   {
-    BlitBitmap(screenBitmap, window, x, y,
+    BlitBitmap(screenBitmap, target_bitmap, x, y,
 	       SCR_FIELDX * TILEX, MAX_BUF_YSIZE * TILEY - y,
 	       SX, SY);
-    BlitBitmap(screenBitmap, window, x, 0,
+    BlitBitmap(screenBitmap, target_bitmap, x, 0,
 	       SCR_FIELDX * TILEX, y - 2 * TILEY,
 	       SX, SY + MAX_BUF_YSIZE * TILEY - y);
   }
   else if (x >= 2 * TILEX && y < 2 * TILEY)
   {
-    BlitBitmap(screenBitmap, window, x, y,
+    BlitBitmap(screenBitmap, target_bitmap, x, y,
 	       MAX_BUF_XSIZE * TILEX - x, SCR_FIELDY * TILEY,
 	       SX, SY);
-    BlitBitmap(screenBitmap, window, 0, y,
+    BlitBitmap(screenBitmap, target_bitmap, 0, y,
 	       x - 2 * TILEX, SCR_FIELDY * TILEY,
 	       SX + MAX_BUF_XSIZE * TILEX - x, SY);
   }
   else
   {
-    BlitBitmap(screenBitmap, window, x, y,
+    BlitBitmap(screenBitmap, target_bitmap, x, y,
 	       MAX_BUF_XSIZE * TILEX - x, MAX_BUF_YSIZE * TILEY - y,
 	       SX, SY);
-    BlitBitmap(screenBitmap, window, 0, y,
+    BlitBitmap(screenBitmap, target_bitmap, 0, y,
 	       x - 2 * TILEX, MAX_BUF_YSIZE * TILEY - y,
 	       SX + MAX_BUF_XSIZE * TILEX - x, SY);
-    BlitBitmap(screenBitmap, window, x, 0,
+    BlitBitmap(screenBitmap, target_bitmap, x, 0,
 	       MAX_BUF_XSIZE * TILEX - x, y - 2 * TILEY,
 	       SX, SY + MAX_BUF_YSIZE * TILEY - y);
-    BlitBitmap(screenBitmap, window, 0, 0,
+    BlitBitmap(screenBitmap, target_bitmap, 0, 0,
 	       x - 2 * TILEX, y - 2 * TILEY,
 	       SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y);
   }
 }
 
+void blitscreen(void)
+{
+#if 1
+
+  static boolean scrolling_last = FALSE;
+  unsigned int left = screen_x / TILEX;
+  unsigned int top  = screen_y / TILEY;
+  boolean scrolling = (screen_x % TILEX != 0 || screen_y % TILEY != 0);
+  int x, y;
+
+  SyncDisplay();
+
+  if (redraw_tiles > REDRAWTILES_THRESHOLD || scrolling || scrolling_last)
+  {
+    /* blit all (up to four) parts of the scroll buffer to the backbuffer */
+    BlitScreenToBitmap_EM(backbuffer);
+
+    /* blit the completely updated backbuffer to the window (in one blit) */
+    BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY);
+  }
+  else
+  {
+    for (x = 0; x < SCR_FIELDX; x++)
+    {
+      for (y = 0; y < SCR_FIELDY; y++)
+      {
+	int xx = (left + x) % MAX_BUF_XSIZE;
+	int yy = (top  + y) % MAX_BUF_YSIZE;
+
+	if (redraw[xx][yy])
+	  BlitBitmap(screenBitmap, window,
+		     xx * TILEX, yy * TILEY, TILEX, TILEY,
+		     SX + x * TILEX, SY + y * TILEY);
+      }
+    }
+  }
+
+  for (x = 0; x < MAX_BUF_XSIZE; x++)
+    for (y = 0; y < MAX_BUF_YSIZE; y++)
+      redraw[x][y] = FALSE;
+  redraw_tiles = 0;
+
+  scrolling_last = scrolling;
+
+#else
+
+  /* blit all (up to four) parts of the scroll buffer to the window */
+  BlitScreenToBitmap_EM(window);
+
+#endif
+}
+
+static void DrawLevelField_EM(int x, int y, int sx, int sy,
+			      boolean draw_masked)
+{
+  int tile = Draw[y][x];
+  struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
+  int src_x = g->src_x + g->src_offset_x;
+  int src_y = g->src_y + g->src_offset_y;
+  int dst_x = sx * TILEX + g->dst_offset_x;
+  int dst_y = sy * TILEY + g->dst_offset_y;
+  int width = g->width;
+  int height = g->height;
+
+  if (draw_masked)
+  {
+    if (width > 0 && height > 0)
+    {
+      SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
+		    dst_x - src_x, dst_y - src_y);
+      BlitBitmapMasked(g->bitmap, screenBitmap,
+		       src_x, src_y, width, height, dst_x, dst_y);
+    }
+  }
+  else
+  {
+    if ((width != TILEX || height != TILEY) && !g->preserve_background)
+      ClearRectangle(screenBitmap, sx * TILEX, sy * TILEY, TILEX, TILEY);
+
+    if (width > 0 && height > 0)
+      BlitBitmap(g->bitmap, screenBitmap,
+		 src_x, src_y, width, height, dst_x, dst_y);
+  }
+}
+
+static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy,
+				      int crm, boolean draw_masked)
+{
+  int tile = Draw[y][x];
+  struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
+  unsigned int i;
+
+  if (crm == 0)		/* no crumbled edges for this tile */
+    return;
+
+  for (i = 0; i < 4; i++)
+  {
+    if (crm & (1 << i))
+    {
+      int width, height, cx, cy;
+
+      if (i == 1 || i == 2)
+      {
+	width = g->crumbled_border_size;
+	height = TILEY;
+	cx = (i == 2 ? TILEX - g->crumbled_border_size : 0);
+	cy = 0;
+      }
+      else
+      {
+	width = TILEX;
+	height = g->crumbled_border_size;
+	cx = 0;
+	cy = (i == 3 ? TILEY - g->crumbled_border_size : 0);
+      }
+
+      if (width > 0 && height > 0)
+      {
+	int src_x = g->crumbled_src_x + cx;
+	int src_y = g->crumbled_src_y + cy;
+	int dst_x = sx * TILEX + cx;
+	int dst_y = sy * TILEY + cy;
+
+	if (draw_masked)
+	{
+	  SetClipOrigin(g->crumbled_bitmap, g->crumbled_bitmap->stored_clip_gc,
+			dst_x - src_x, dst_y - src_y);
+	  BlitBitmapMasked(g->crumbled_bitmap, screenBitmap,
+			   src_x, src_y, width, height, dst_x, dst_y);
+	}
+	else
+	  BlitBitmap(g->crumbled_bitmap, screenBitmap,
+		     src_x, src_y, width, height, dst_x, dst_y);
+      }
+    }
+  }
+}
+
+static void DrawLevelPlayer_EM(int x1, int y1, int player_nr, int anim,
+			       boolean draw_masked)
+{
+  struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame];
+
+  int src_x = g->src_x, src_y = g->src_y;
+  int dst_x, dst_y;
+
+  if (draw_masked)
+  {
+    /* draw the player to current location */
+    dst_x = x1;
+    dst_y = y1;
+    SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
+		  dst_x - src_x, dst_y - src_y);
+    BlitBitmapMasked(g->bitmap, screenBitmap,
+		     src_x, src_y, TILEX, TILEY, dst_x, dst_y);
+
+    /* draw the player to opposite wrap-around column */
+    dst_x = x1 - MAX_BUF_XSIZE * TILEX;
+    dst_y = y1;
+    SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
+		  dst_x - src_x, dst_y - src_y);
+    BlitBitmapMasked(g->bitmap, screenBitmap,
+		     g->src_x, g->src_y, TILEX, TILEY, dst_x, dst_y);
+
+    /* draw the player to opposite wrap-around row */
+    dst_x = x1;
+    dst_y = y1 - MAX_BUF_YSIZE * TILEY;
+    SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
+		  dst_x - src_x, dst_y - src_y);
+    BlitBitmapMasked(g->bitmap, screenBitmap,
+		     g->src_x, g->src_y, TILEX, TILEY, dst_x, dst_y);
+  }
+  else
+  {
+    /* draw the player to current location */
+    dst_x = x1;
+    dst_y = y1;
+    BlitBitmap(g->bitmap, screenBitmap,
+	       g->src_x, g->src_y, TILEX, TILEY, dst_x, dst_y);
+
+    /* draw the player to opposite wrap-around column */
+    dst_x = x1 - MAX_BUF_XSIZE * TILEX;
+    dst_y = y1;
+    BlitBitmap(g->bitmap, screenBitmap,
+	       g->src_x, g->src_y, TILEX, TILEY, dst_x, dst_y);
+
+    /* draw the player to opposite wrap-around row */
+    dst_x = x1;
+    dst_y = y1 - MAX_BUF_YSIZE * TILEY;
+    BlitBitmap(g->bitmap, screenBitmap,
+	       g->src_x, g->src_y, TILEX, TILEY, dst_x, dst_y);
+  }
+}
 
 /* draw differences between game tiles and screen tiles
  *
@@ -79,7 +274,7 @@ static void animscreen(void)
 {
   unsigned int x, y, i;
   unsigned int left = screen_x / TILEX;
-  unsigned int top = screen_y / TILEY;
+  unsigned int top  = screen_y / TILEY;
   static int xy[4][2] =
   {
     { 0, -1 },
@@ -92,16 +287,13 @@ static void animscreen(void)
   {
     for (x = left; x < left + MAX_BUF_XSIZE; x++)
     {
-      int dx = x % MAX_BUF_XSIZE;
-      int dy = y % MAX_BUF_YSIZE;    
+      int sx = x % MAX_BUF_XSIZE;
+      int sy = y % MAX_BUF_YSIZE;    
       int tile = Draw[y][x];
       struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame];
-      unsigned int obj;
+      unsigned int obj = g->unique_identifier;
       unsigned int crm = 0;
 
-#if 1
-
-#if 1
       /* re-calculate crumbled state of this tile */
       if (g->has_crumbled_graphics)
       {
@@ -121,151 +313,19 @@ static void animscreen(void)
 	    crm |= (1 << i);
 	}
       }
-#else
-      /* re-calculate crumbled state of this tile */
-      if (tile == Xgrass ||
-	  tile == Xdirt ||
-	  tile == Xfake_grass ||
-	  tile == Xfake_grassB)
-      {
-	for (i = 0; i < 4; i++)
-	{
-	  int xx = x + xy[i][0];
-	  int yy = y + xy[i][1];
-	  int tile2;
-
-	  if (xx < 0 || xx >= EM_MAX_CAVE_WIDTH ||
-	      yy < 0 || yy >= EM_MAX_CAVE_HEIGHT)
-	    continue;
-
-	  tile2 = Draw[yy][xx];
-
-	  if (tile2 == Xgrass ||
-	      tile2 == Xdirt ||
-	      tile2 == Xfake_grass ||
-	      tile2 == Xfake_grassB ||
-	      tile2 == Ygrass_nB ||
-	      tile2 == Ygrass_eB ||
-	      tile2 == Ygrass_sB ||
-	      tile2 == Ygrass_wB ||
-	      tile2 == Ydirt_nB ||
-	      tile2 == Ydirt_eB ||
-	      tile2 == Ydirt_sB ||
-	      tile2 == Ydirt_wB)
-	    continue;
-
-	  crm |= (1 << i);
-	}
-      }
-#endif
-
-      /* create unique graphic identifier to decide if tile must be redrawn */
-      obj = g->unique_identifier;
 
-      if (screentiles[dy][dx] != obj || crumbled_state[dy][dx] != crm)
+      /* only redraw screen tiles if they (or their crumbled state) changed */
+      if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm)
       {
-	int dst_x = dx * TILEX;
-	int dst_y = dy * TILEY;
-
-	if (g->width != TILEX || g->height != TILEY)
-	  ClearRectangle(screenBitmap, dst_x, dst_y, TILEX, TILEY);
-
-	if (g->width > 0 && g->height > 0)
-	  BlitBitmap(g->bitmap, screenBitmap,
-		     g->src_x + g->src_offset_x, g->src_y + g->src_offset_y,
-		     g->width, g->height,
-		     dst_x + g->dst_offset_x, dst_y + g->dst_offset_y);
-
-#if 1
-	/* add crumbling graphic, if needed */
-	if (crm)
-	{
-	  for (i = 0; i < 4; i++)
-	  {
-	    if (crm & (1 << i))
-	    {
-	      int width, height, cx, cy;
-
-	      if (i == 1 || i == 2)
-	      {
-		width = g->crumbled_border_size;
-		height = TILEY;
-		cx = (i == 2 ? TILEX - g->crumbled_border_size : 0);
-		cy = 0;
-	      }
-	      else
-	      {
-		width = TILEX;
-		height = g->crumbled_border_size;
-		cx = 0;
-		cy = (i == 3 ? TILEY - g->crumbled_border_size : 0);
-	      }
-
-	      if (width > 0 && height > 0)
-		BlitBitmap(g->crumbled_bitmap, screenBitmap,
-			   g->crumbled_src_x + cx, g->crumbled_src_y + cy,
-			   width, height, dst_x + cx, dst_y + cy);
-	    }
-	  }
-	}
-#else
-	/* add crumbling graphic, if needed */
-	if (crm)
-	{
-	  int crumbled_border_size;
-
-	  tile = (tile == Xgrass ? Ygrass_crumbled :
-		  tile == Xdirt ? Ydirt_crumbled :
-		  tile == Xfake_grass ? Yfake_grass_crumbled :
-		  tile == Xfake_grassB ? Yfake_grassB_crumbled : 0);
-	  g = &graphic_info_em_object[tile][frame];
-	  crumbled_border_size = g->border_size;
-
-	  for (i = 0; i < 4; i++)
-	  {
-	    if (crm & (1 << i))
-	    {
-	      int width, height, cx, cy;
-
-	      if (i == 1 || i == 2)
-	      {
-		width = crumbled_border_size;
-		height = TILEY;
-		cx = (i == 2 ? TILEX - crumbled_border_size : 0);
-		cy = 0;
-	      }
-	      else
-	      {
-		width = TILEX;
-		height = crumbled_border_size;
-		cx = 0;
-		cy = (i == 3 ? TILEY - crumbled_border_size : 0);
-	      }
-
-	      if (width > 0 && height > 0)
-		BlitBitmap(g->bitmap, screenBitmap,
-			   g->src_x + cx, g->src_y + cy, width, height,
-			   dst_x + cx, dst_y + cy);
-	    }
-	  }
-	}
-#endif
+	DrawLevelField_EM(x, y, sx, sy, FALSE);
+	DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE);
 
-	screentiles[dy][dx] = obj;
-	crumbled_state[dy][dx] = crm;
-      }
-#else
-      obj = map_obj[frame][tile];
+	screentiles[sy][sx] = obj;
+	crumbled_state[sy][sx] = crm;
 
-      if (screentiles[dy][dx] != obj)
-      {
-	BlitBitmap(objBitmap, screenBitmap,
-		   (obj / 512) * TILEX, (obj % 512) * TILEY / 16,
-		   TILEX, TILEY, dx * TILEX, dy * TILEY);
-
-	screentiles[dy][dx] = obj;
+	redraw[sx][sy] = TRUE;
+	redraw_tiles++;
       }
-#endif
     }
   }
 }
@@ -278,27 +338,11 @@ static void animscreen(void)
 
 static void blitplayer(struct PLAYER *ply)
 {
-  int dx, dy;
-  int old_x, old_y, new_x, new_y;
-  int src_x, src_y, dst_x, dst_y;
   unsigned int x1, y1, x2, y2;
-#if 1
-  unsigned short spr;
-#else
-  unsigned short obj, spr;
-#endif
 
   if (!ply->alive)
     return;
 
-  /* some casts to "int" are needed because of negative calculation values */
-  dx = (int)ply->x - (int)ply->oldx;
-  dy = (int)ply->y - (int)ply->oldy;
-  old_x = (int)ply->oldx + (7 - (int)frame) * dx / 8;
-  old_y = (int)ply->oldy + (7 - (int)frame) * dy / 8;
-  new_x = old_x + SIGN(dx);
-  new_y = old_y + SIGN(dy);
-
   /* x1/y1 are left/top and x2/y2 are right/down part of the player movement */
   x1 = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8;
   y1 = (frame * ply->oldy + (8 - frame) * ply->y) * TILEY / 8;
@@ -308,171 +352,73 @@ static void blitplayer(struct PLAYER *ply)
   if ((unsigned int)(x2 - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) &&
       (unsigned int)(y2 - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1))
   {
-    struct GraphicInfo_EM *g;
-    int tile;
+    /* some casts to "int" are needed because of negative calculation values */
+    int dx = (int)ply->x - (int)ply->oldx;
+    int dy = (int)ply->y - (int)ply->oldy;
+    int old_x = (int)ply->oldx + (7 - (int)frame) * dx / 8;
+    int old_y = (int)ply->oldy + (7 - (int)frame) * dy / 8;
+    int new_x = old_x + SIGN(dx);
+    int new_y = old_y + SIGN(dy);
+    int old_sx = old_x % MAX_BUF_XSIZE;
+    int old_sy = old_y % MAX_BUF_XSIZE;
+    int new_sx = new_x % MAX_BUF_XSIZE;
+    int new_sy = new_y % MAX_BUF_XSIZE;
+#if 0
+    int old_crm = crumbled_state[old_sy][old_sx];
+#endif
+    int new_crm = crumbled_state[new_sy][new_sx];
+
+    /* only diggable elements can be crumbled in the classic EM engine */
+    boolean player_is_digging = (new_crm != 0);
 
-    spr = map_spr[ply->num][frame][ply->anim];
     x1 %= MAX_BUF_XSIZE * TILEX;
     y1 %= MAX_BUF_YSIZE * TILEY;
     x2 %= MAX_BUF_XSIZE * TILEX;
     y2 %= MAX_BUF_YSIZE * TILEY;
 
-#if 1
-
-#if 1
-    g = &graphic_info_em_player[ply->num][ply->anim][frame];
-
-    /* draw the player to current location */
-    BlitBitmap(g->bitmap, screenBitmap,
-	       g->src_x, g->src_y, TILEX, TILEY,
-	       x1, y1);
-
-    /* draw the player to opposite wrap-around column */
-    BlitBitmap(g->bitmap, screenBitmap,
-	       g->src_x, g->src_y, TILEX, TILEY,
-	       x1 - MAX_BUF_XSIZE * TILEX, y1);
-
-    /* draw the player to opposite wrap-around row */
-    BlitBitmap(g->bitmap, screenBitmap,
-	       g->src_x, g->src_y, TILEX, TILEY,
-	       x1, y1 - MAX_BUF_YSIZE * TILEY);
-#else
-    /* draw the player to current location */
-    BlitBitmap(sprBitmap, screenBitmap,
-	       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-	       x1, y1);
-
-    /* draw the player to opposite wrap-around column */
-    BlitBitmap(sprBitmap, screenBitmap,
-	       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-	       x1 - MAX_BUF_XSIZE * TILEX, y1);
-
-    /* draw the player to opposite wrap-around row */
-    BlitBitmap(sprBitmap, screenBitmap,
-	       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-	       x1, y1 - MAX_BUF_YSIZE * TILEY);
-#endif
-
-    /* draw the field the player is moving from (masked over the player) */
-#if 0
-    obj = screentiles[y1 / TILEY][x1 / TILEX];
-    src_x = (obj / 512) * TILEX;
-    src_y = (obj % 512) * TILEY / 16;
-    dst_x = (x1 / TILEX) * TILEX;
-    dst_y = (y1 / TILEY) * TILEY;
-#endif
-
-#if 1
-    tile = Draw[old_y][old_x];
-    g = &graphic_info_em_object[tile][frame];
-
-    if (g->width > 0 && g->height > 0)
+    if (player_is_digging)
     {
-      src_x = g->src_x + g->src_offset_x;
-      src_y = g->src_y + g->src_offset_y;
-      dst_x = old_x % MAX_BUF_XSIZE * TILEX + g->dst_offset_x;
-      dst_y = old_y % MAX_BUF_YSIZE * TILEY + g->dst_offset_y;
-
-      SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
-		    dst_x - src_x, dst_y - src_y);
-      BlitBitmapMasked(g->bitmap, screenBitmap,
-		       src_x, src_y, g->width, g->height, dst_x, dst_y);
-    }
-#else
-    SetClipOrigin(objBitmap, objBitmap->stored_clip_gc,
-		  dst_x - src_x, dst_y - src_y);
-    BlitBitmapMasked(objBitmap, screenBitmap,
-		     src_x, src_y, TILEX, TILEY, dst_x, dst_y);
-#endif
-
-    /* draw the field the player is moving to (masked over the player) */
 #if 0
-    obj = screentiles[y2 / TILEY][x2 / TILEX];
-    src_x = (obj / 512) * TILEX;
-    src_y = (obj % 512) * TILEY / 16;
-    dst_x = (x2 / TILEX) * TILEX;
-    dst_y = (y2 / TILEY) * TILEY;
+      /* draw the field the player is moving from (under the player) */
+      DrawLevelField_EM(old_x, old_y, old_sx, old_sy, FALSE);
+      DrawLevelFieldCrumbled_EM(old_x, old_y, old_sx, old_sy, old_crm, FALSE);
 #endif
 
-#if 1
-    tile = Draw[new_y][new_x];
-    g = &graphic_info_em_object[tile][frame];
+      /* draw the field the player is moving to (under the player) */
+      DrawLevelField_EM(new_x, new_y, new_sx, new_sy, FALSE);
+      DrawLevelFieldCrumbled_EM(new_x, new_y, new_sx, new_sy, new_crm, FALSE);
 
-    if (g->width > 0 && g->height > 0)
-    {
-      src_x = g->src_x + g->src_offset_x;
-      src_y = g->src_y + g->src_offset_y;
-      dst_x = new_x % MAX_BUF_XSIZE * TILEX + g->dst_offset_x;
-      dst_y = new_y % MAX_BUF_YSIZE * TILEY + g->dst_offset_y;
+      /* draw the player (masked) over the element he is just digging away */
+      DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, TRUE);
 
-      SetClipOrigin(g->bitmap, g->bitmap->stored_clip_gc,
-		    dst_x - src_x, dst_y - src_y);
-      BlitBitmapMasked(g->bitmap, screenBitmap,
-		       src_x, src_y, g->width, g->height, dst_x, dst_y);
-    }
-#else
-    SetClipOrigin(objBitmap, objBitmap->stored_clip_gc,
-		  dst_x - src_x, dst_y - src_y);
-    BlitBitmapMasked(objBitmap, screenBitmap,
-		     src_x, src_y, TILEX, TILEY, dst_x, dst_y);
+#if 1
+      /* draw the field the player is moving from (masked over the player) */
+      DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE);
 #endif
-
-#else
-
-    if (objmaskBitmap)
-    {
-      obj = screentiles[y1 / TILEY][x1 / TILEX];
-      XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
-		(obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
-		-(x1 % TILEX), -(y1 % TILEY));
-
-      obj = screentiles[y2 / TILEY][x2 / TILEX];
-      XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
-		(obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
-		(MAX_BUF_XSIZE * TILEX - x1) % TILEX,
-		(MAX_BUF_YSIZE * TILEY - y1) % TILEY);
-    }
-    else if (sprmaskBitmap)
-    {
-      XCopyArea(display, sprmaskBitmap, spriteBitmap, spriteGC,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, 0, 0);
     }
     else
     {
-      XFillRectangle(display, spriteBitmap, spriteGC, 0, 0, TILEX, TILEY);
-    }
-
-    SetClipMask(sprBitmap, sprBitmap->stored_clip_gc, spriteBitmap);
+      /* draw the player under the element which is on the same field */
+      DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, FALSE);
 
-    SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc, x, y);
-    BlitBitmapMasked(sprBitmap, screenBitmap,
-		     (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		     x1, y1);
+      /* draw the field the player is moving from (masked over the player) */
+      DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE);
 
-    SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc,
-		  x - MAX_BUF_XSIZE * TILEX, y);
-    BlitBitmapMasked(sprBitmap, screenBitmap,
-		     (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		     x1 - MAX_BUF_XSIZE * TILEX, y1);
-
-    SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc,
-		  x1, y1 - MAX_BUF_YSIZE * TILEY);
-    BlitBitmapMasked(sprBitmap, screenBitmap,
-		     (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		     x1, y1 - MAX_BUF_YSIZE * TILEY);
-
-    SetClipMask(sprBitmap, sprBitmap->stored_clip_gc, None);
-#endif
+      /* draw the field the player is moving to (masked over the player) */
+      DrawLevelField_EM(new_x, new_y, new_sx, new_sy, TRUE);
+    }
 
     /* mark screen tiles as dirty */
-    screentiles[y1 / TILEY][x1 / TILEX] = -1;
-    screentiles[y2 / TILEY][x2 / TILEX] = -1;
+    screentiles[old_sy][old_sx] = -1;
+    screentiles[new_sy][new_sx] = -1;
   }
 }
 
 void game_initscreen(void)
 {
   unsigned int x,y;
+  int dynamite_state = ply[0].dynamite;		/* !!! ONLY PLAYER 1 !!! */
+  int all_keys_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys;
 
   frame = 6;
   screen_x = 0;
@@ -487,17 +433,23 @@ void game_initscreen(void)
     }
   }
 
-  DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score,
-			DISPLAY_TIME(lev.time + 4));
+#if 1
+  DrawAllGameValues(lev.required, dynamite_state, lev.score,
+		    lev.time, all_keys_state);
+#else
+  DrawAllGameValues(lev.required, ply1.dynamite, lev.score,
+		    DISPLAY_TIME(lev.time + 4), ply1.keys | ply2.keys);
+#endif
 }
 
-void game_animscreen(void)
+void RedrawPlayfield_EM()
 {
-  unsigned int x,y;
+  unsigned int i, x, y;
 
-  x = (frame * ply1.oldx + (8 - frame) * ply1.x) * TILEX / 8
+  /* !!! FIX THIS (CENTERED TO PLAYER 1) !!! */
+  x = (frame * ply[0].oldx + (8 - frame) * ply[0].x) * TILEX / 8
     + ((SCR_FIELDX - 1) * TILEX) / 2;
-  y = (frame * ply1.oldy + (8 - frame) * ply1.y) * TILEY / 8
+  y = (frame * ply[0].oldy + (8 - frame) * ply[0].y) * TILEY / 8
     + ((SCR_FIELDY - 1) * TILEY) / 2;
 
   if (x > lev.width * TILEX)
@@ -514,9 +466,30 @@ void game_animscreen(void)
   screen_y = y - (SCR_FIELDY - 1) * TILEY;
 
   animscreen();
-  blitplayer(&ply1);
-  blitplayer(&ply2);
+
+  for (i = 0; i < MAX_PLAYERS; i++)
+    blitplayer(&ply[i]);
+
   blitscreen();
 
   FlushDisplay();
 }
+
+void game_animscreen(void)
+{
+  RedrawPlayfield_EM();
+}
+
+void DrawGameDoorValues_EM()
+{
+  int dynamite_state = ply[0].dynamite;		/* !!! ONLY PLAYER 1 !!! */
+  int all_keys_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys;
+
+#if 1
+  DrawAllGameValues(lev.required, dynamite_state, lev.score,
+		    lev.time, all_keys_state);
+#else
+  DrawAllGameValues(lev.required, ply1.dynamite, lev.score,
+		    DISPLAY_TIME(lev.time), ply1.keys | ply2.keys);
+#endif
+}