* 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;
x - 2 * TILEX, y - 2 * TILEY,
SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y);
}
-
- XFlush(display);
}
for (y = top; y < top + MAX_BUF_YSIZE; y++)
{
dy = y % MAX_BUF_YSIZE;
+
for (x = left; x < left + MAX_BUF_XSIZE; x++)
{
+ int tile = Draw[y][x];
+
dx = x % MAX_BUF_XSIZE;
- obj = map_obj[frame][Draw[y][x]];
+ obj = map_obj[frame][tile];
if (screentiles[dy][dx] != obj)
{
- screentiles[dy][dx] = obj;
+#if 1
+ struct GraphicInfo_EM *g = &graphic_info_em[tile][frame];
+ 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);
+#else
BlitBitmap(objBitmap, screenBitmap,
(obj / 512) * TILEX, (obj % 512) * TILEY / 16,
TILEX, TILEY, dx * TILEX, dy * TILEY);
+#endif
+
+ screentiles[dy][dx] = obj;
}
}
}
{
unsigned int x, y, dx, dy;
unsigned short obj, spr;
+ int src_x, src_y, dst_x, dst_y;
- if (ply->alive)
+ if (!ply->alive)
+ return;
+
+ 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))
{
- 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;
+ 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 ((unsigned int)(dx - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) &&
- (unsigned int)(dy - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1))
+#if 1
+ /* 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;
+ dst_x = (x / TILEX) * TILEX;
+ dst_y = (y / TILEY) * TILEY;
+
+#if 1
+#if 0
{
- 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;
+ int tile = Draw[ply->oldy][ply->oldx];
+ struct GraphicInfo_EM *g = &graphic_info_em[tile][frame];
- 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)
+ if (g->width > 0 && g->height > 0)
{
- XCopyArea(display, sprmaskBitmap, spriteBitmap, spriteGC,
- (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, 0, 0);
- }
- else
- {
- XFillRectangle(display, spriteBitmap, spriteGC, 0, 0, TILEX, TILEY);
+ src_x = g->src_x + g->src_offset_x;
+ src_y = g->src_y + g->src_offset_y;
+ dst_x = ply->oldx % MAX_BUF_XSIZE * TILEX + g->dst_offset_x;
+ dst_y = ply->oldy % 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
+#endif
- screentiles[y / TILEY][x / TILEX] = -1; /* mark screen as dirty */
- screentiles[dy / TILEY][dx / TILEX] = -1;
+ /* 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;
+ dst_x = (dx / TILEX) * TILEX;
+ dst_y = (dy / TILEY) * TILEY;
#if 1
-
-
#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);
+ {
+ /*
+ d? == 1:
+ 0-3: 0, 1
+ 4-7: 0, 1
+
+ d? == 2:
+ 0-3: 0, 1
+ 4-7: 1, 2
+ */
+
+ int dx = (ply->x - ply->oldx);
+ int dy = (ply->y - ply->oldy);
+ int old_x = ply->oldx ;
+ int old_y = ply->oldy ;
+ int new_x = ply->oldx ;
+ int new_y = ply->oldy ;
+ int xxx = (frame * ply->oldx + (8 - frame) * ply->x) / 8;
+ int yyy = (frame * ply->oldy + (8 - frame) * ply->y) / 8;
+ int tileXXX = Draw[ply->y][ply->x];
+ int tile = Draw[ply->y][ply->x];
+ struct GraphicInfo_EM *g = &graphic_info_em[tile][frame];
+ int xx = ply->x - 1, yy = ply->y;
+
+ printf("::: %d: %d,%d -> %d,%d: %d, %d, %d, %d [%d,%d] <-> ",
+ frame, ply->oldx, ply->oldy, ply->x, ply->y,
+ src_x, src_y, dst_x, dst_y, xxx, yyy);
+
+ 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 = ply->x % MAX_BUF_XSIZE * TILEX + g->dst_offset_x;
+ dst_y = ply->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);
+
+ printf("::: %d, %d, %d, %d\n",
+ src_x, src_y, 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
+#endif
#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;
}
}
screentiles[y][x] = -1;
DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score,
- (lev.time + 4) / 5);
+ DISPLAY_TIME(lev.time + 4));
}
void game_animscreen(void)
blitplayer(&ply2);
blitscreen();
- XFlush(display);
+ FlushDisplay();
}
-
-#endif
projects / rocksndiamonds.git / blobdiff