X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=3dcbb778486e284080a6df999778dda3c0a4e9aa;hb=c5321d9d36d0a74062651d0352fbbaccbe125eca;hp=2de3e1702d41d67ffdf9955ebfec4923cf21dfe8;hpb=afc13e1c0cca61ea29a91198f1e36d22c0c9e7e4;p=rocksndiamonds.git

diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c
index 2de3e170..3dcbb778 100644
--- a/src/game_em/graphics.c
+++ b/src/game_em/graphics.c
@@ -3,16 +3,11 @@
  * graphics manipulation crap
  */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
 #include "global.h"
 #include "display.h"
 #include "level.h"
 
 
-#if defined(TARGET_X11)
-
 unsigned int frame;		/* current screen frame */
 unsigned int screen_x;		/* current scroll position */
 unsigned int screen_y;
@@ -69,8 +64,6 @@ void blitscreen(void)
 	       x - 2 * TILEX, y - 2 * TILEY,
 	       SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y);
   }
-
-  XFlush(display);
 }
 
 
@@ -117,122 +110,112 @@ static void blitplayer(struct PLAYER *ply)
 {
   unsigned int x, y, dx, dy;
   unsigned short obj, spr;
+  int src_x, src_y, dest_x, dest_y;
 
-  if (ply->alive)
-  {
-    x = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8;
-    y = (frame * ply->oldy + (8 - frame) * ply->y) * TILEY / 8;
-    dx = x + TILEX - 1;
-    dy = y + TILEY - 1;
-
-    if ((unsigned int)(dx - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) &&
-	(unsigned int)(dy - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1))
-    {
-      spr = map_spr[ply->num][frame][ply->anim];
-      x  %= MAX_BUF_XSIZE * TILEX;
-      y  %= MAX_BUF_YSIZE * TILEY;
-      dx %= MAX_BUF_XSIZE * TILEX;
-      dy %= MAX_BUF_YSIZE * TILEY;
-
-      if (objmaskBitmap)
-      {
-	obj = screentiles[y / TILEY][x / TILEX];
-	XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
-		  (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
-		  -(x % TILEX), -(y % TILEY));
-
-	obj = screentiles[dy / TILEY][dx / TILEX];
-	XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
-		  (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
-		  (MAX_BUF_XSIZE * TILEX - x) % TILEX,
-		  (MAX_BUF_YSIZE * TILEY - y) % 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);
-      }
-
-      screentiles[y / TILEY][x / TILEX] = -1; /* mark screen as dirty */
-      screentiles[dy / TILEY][dx / TILEX] = -1;
+  if (!ply->alive)
+    return;
 
-#if 1
+  x = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8;
+  y = (frame * ply->oldy + (8 - frame) * ply->y) * TILEY / 8;
+  dx = x + TILEX - 1;
+  dy = y + TILEY - 1;
 
+  if ((unsigned int)(dx - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) &&
+      (unsigned int)(dy - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1))
+  {
+    spr = map_spr[ply->num][frame][ply->anim];
+    x %= MAX_BUF_XSIZE * TILEX;
+    y %= MAX_BUF_YSIZE * TILEY;
+    dx %= MAX_BUF_XSIZE * TILEX;
+    dy %= MAX_BUF_YSIZE * TILEY;
 
 #if 1
-
-      SetClipMask(sprBitmap, sprBitmap->stored_clip_gc, spriteBitmap);
-
-      SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc, x, y);
-      BlitBitmapMasked(sprBitmap, screenBitmap,
-		       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		       x, y);
-
-      SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc,
-		    x - MAX_BUF_XSIZE * TILEX, y);
-      BlitBitmapMasked(sprBitmap, screenBitmap,
-		       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		       x - MAX_BUF_XSIZE * TILEX, y);
-
-      SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc,
-		    x, y - MAX_BUF_YSIZE * TILEY);
-      BlitBitmapMasked(sprBitmap, screenBitmap,
-		       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		       x, y - MAX_BUF_YSIZE * TILEY);
-
-      SetClipMask(sprBitmap, sprBitmap->stored_clip_gc, None);
+    /* draw the player to current location */
+    BlitBitmap(sprBitmap, screenBitmap,
+	       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+	       x, y);
+    /* draw the player to opposite wrap-around column */
+    BlitBitmap(sprBitmap, screenBitmap,
+	       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+	       x - MAX_BUF_XSIZE * TILEX, y),
+    /* draw the player to opposite wrap-around row */
+    BlitBitmap(sprBitmap, screenBitmap,
+	       (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+	       x, y - MAX_BUF_YSIZE * TILEY);
+
+    /* draw the field the player is moving from (masked over the player) */
+    obj = screentiles[y / TILEY][x / TILEX];
+    src_x = (obj / 512) * TILEX;
+    src_y = (obj % 512) * TILEY / 16;
+    dest_x = (x / TILEX) * TILEX;
+    dest_y = (y / TILEY) * TILEY;
+
+    SetClipOrigin(objBitmap, objBitmap->stored_clip_gc,
+		  dest_x - src_x, dest_y - src_y);
+    BlitBitmapMasked(objBitmap, screenBitmap,
+		     src_x, src_y, TILEX, TILEY, dest_x, dest_y);
+
+    /* draw the field the player is moving to (masked over the player) */
+    obj = screentiles[dy / TILEY][dx / TILEX];
+    src_x = (obj / 512) * TILEX;
+    src_y = (obj % 512) * TILEY / 16;
+    dest_x = (dx / TILEX) * TILEX;
+    dest_y = (dy / TILEY) * TILEY;
+
+    SetClipOrigin(objBitmap, objBitmap->stored_clip_gc,
+		  dest_x - src_x, dest_y - src_y);
+    BlitBitmapMasked(objBitmap, screenBitmap,
+		     src_x, src_y, TILEX, TILEY, dest_x, dest_y);
 
 #else
 
-      XSetClipMask(display, sprBitmap->stored_clip_gc, spriteBitmap);
+    if (objmaskBitmap)
+    {
+      obj = screentiles[y / TILEY][x / TILEX];
+      XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
+		(obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
+		-(x % TILEX), -(y % TILEY));
+
+      obj = screentiles[dy / TILEY][dx / TILEX];
+      XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC,
+		(obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY,
+		(MAX_BUF_XSIZE * TILEX - x) % TILEX,
+		(MAX_BUF_YSIZE * TILEY - y) % 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);
 
-      XSetClipOrigin(display, sprBitmap->stored_clip_gc, x, y);
-      XCopyArea(display, sprBitmap->drawable, screenBitmap->drawable,
-		sprBitmap->stored_clip_gc,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		x, y);
+    SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc, x, y);
+    BlitBitmapMasked(sprBitmap, screenBitmap,
+		     (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
+		     x, y);
 
-      XSetClipOrigin(display, sprBitmap->stored_clip_gc,
+    SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc,
+		  x - MAX_BUF_XSIZE * TILEX, y);
+    BlitBitmapMasked(sprBitmap, screenBitmap,
+		     (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
 		     x - MAX_BUF_XSIZE * TILEX, y);
-      XCopyArea(display, sprBitmap->drawable, screenBitmap->drawable,
-		sprBitmap->stored_clip_gc,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		x - MAX_BUF_XSIZE * TILEX, y);
 
-      XSetClipOrigin(display, sprBitmap->stored_clip_gc,
+    SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc,
+		  x, y - MAX_BUF_YSIZE * TILEY);
+    BlitBitmapMasked(sprBitmap, screenBitmap,
+		     (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
 		     x, y - MAX_BUF_YSIZE * TILEY);
-      XCopyArea(display, sprBitmap->drawable, screenBitmap->drawable,
-		sprBitmap->stored_clip_gc,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		x, y - MAX_BUF_YSIZE * TILEY);
-
-      XSetClipMask(display, sprBitmap->stored_clip_gc, None);
 
+    SetClipMask(sprBitmap, sprBitmap->stored_clip_gc, None);
 #endif
 
-#else
-
-      XSetClipMask(display, screenGC, spriteBitmap);
-      XSetClipOrigin(display, screenGC, x, y);
-      XCopyArea(display, sprPixmap, screenPixmap, screenGC,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		x, y);
-      XSetClipOrigin(display, screenGC, x - MAX_BUF_XSIZE * TILEX, y);
-      XCopyArea(display, sprPixmap, screenPixmap, screenGC,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		x - MAX_BUF_XSIZE * TILEX, y);
-      XSetClipOrigin(display, screenGC, x, y - MAX_BUF_YSIZE * TILEY);
-      XCopyArea(display, sprPixmap, screenPixmap, screenGC,
-		(spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY,
-		x, y - MAX_BUF_YSIZE * TILEY);
-      XSetClipMask(display, screenGC, None);
-
-#endif
-    }
+    screentiles[y / TILEY][x / TILEX] = -1;	/* mark screen as dirty */
+    screentiles[dy / TILEY][dx / TILEX] = -1;
   }
 }
 
@@ -279,7 +262,5 @@ void game_animscreen(void)
   blitplayer(&ply2);
   blitscreen();
 
-  XFlush(display);
+  FlushDisplay();
 }
-
-#endif