X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=2de3e1702d41d67ffdf9955ebfec4923cf21dfe8;hb=2362e426463cb445e119a4e3e5ce0b6ccb3fb33c;hp=f7f099a54917d15a6db5c4c24fcc19082f3db481;hpb=2b65ec99f743dde3ee41083cf89623d4d9b8740e;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index f7f099a5..2de3e170 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -10,122 +10,114 @@ #include "display.h" #include "level.h" -#include - #if defined(TARGET_X11) -unsigned int frame; /* current frame */ -unsigned int screen_x; /* current scroll position */ +unsigned int frame; /* current screen frame */ +unsigned int screen_x; /* current scroll position */ unsigned int screen_y; -static unsigned short screentiles[14][22]; /* tiles currently on screen */ - -static unsigned int colours[8]; -static unsigned int colour_anim; - -static void xdebug(char *msg) -{ -#if 0 - XSync(display, False); - printf("EM DEBUG: %s\n", msg); -#endif -} +/* tiles currently on screen */ +static unsigned short screentiles[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; -static void colour_shuffle(void) -{ - unsigned int i, j, k; - for (i = 0; i < 8; i++) colours[i] = i; - for (i = 0; i < 8; i++) { - Random = Random * 129 + 1; - j = (Random >> 10) & 7; - k = colours[i]; - colours[i] = colours[j]; - colours[j] = k; - } -} /* copy the entire screen to the window at the scroll position * * perhaps use mit-shm to speed this up */ + void blitscreen(void) { - unsigned int x = screen_x % (22 * TILEX); - unsigned int y = screen_y % (14 * TILEY); - - xdebug("blitscreen"); - -#if 0 - printf("::: %d, %d [%d, %d]\n", x, y, TILEX, TILEY); -#endif + 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) { - -#if 0 - printf("!!! %ld, %ld, %ld, %ld\n", - display, screenPixmap, xwindow, screenGC); -#endif + if (x < 2 * TILEX && y < 2 * TILEY) + { + BlitBitmap(screenBitmap, window, x, y, + SCR_FIELDX * TILEX, SCR_FIELDY * TILEY, SX, SY); + } + else if (x < 2 * TILEX && y >= 2 * TILEY) + { + BlitBitmap(screenBitmap, window, x, y, + SCR_FIELDX * TILEX, MAX_BUF_YSIZE * TILEY - y, + SX, SY); + BlitBitmap(screenBitmap, window, 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, + MAX_BUF_XSIZE * TILEX - x, SCR_FIELDY * TILEY, + SX, SY); + BlitBitmap(screenBitmap, window, 0, y, + x - 2 * TILEX, SCR_FIELDY * TILEY, + SX + MAX_BUF_XSIZE * TILEX - x, SY); + } + else + { + BlitBitmap(screenBitmap, window, x, y, + MAX_BUF_XSIZE * TILEX - x, MAX_BUF_YSIZE * TILEY - y, + SX, SY); + BlitBitmap(screenBitmap, window, 0, y, + x - 2 * TILEX, MAX_BUF_YSIZE * TILEY - y, + SX + MAX_BUF_XSIZE * TILEX - x, SY); + BlitBitmap(screenBitmap, window, x, 0, + MAX_BUF_XSIZE * TILEX - x, y - 2 * TILEY, + SX, SY + MAX_BUF_YSIZE * TILEY - y); + BlitBitmap(screenBitmap, window, 0, 0, + x - 2 * TILEX, y - 2 * TILEY, + SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y); + } - XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 20 * TILEX, 12 * TILEY, SX, SY); - } else if (x < 2 * TILEX && y >= 2 * TILEY) { - XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 20 * TILEX, 14 * TILEY - y, SX, SY); - XCopyArea(display, screenPixmap, xwindow, screenGC, x, 0, 20 * TILEX, y - 2 * TILEY, SX, SY + 14 * TILEY - y); - } else if (x >= 2 * TILEX && y < 2 * TILEY) { - XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 22 * TILEX - x, 12 * TILEY, SX, SY); - XCopyArea(display, screenPixmap, xwindow, screenGC, 0, y, x - 2 * TILEX, 12 * TILEY, SX + 22 * TILEX - x, SY); - } else { - XCopyArea(display, screenPixmap, xwindow, screenGC, x, y, 22 * TILEX - x, 14 * TILEY - y, SX, SY); - XCopyArea(display, screenPixmap, xwindow, screenGC, 0, y, x - 2 * TILEX, 14 * TILEY - y, SX + 22 * TILEX - x, SY); - XCopyArea(display, screenPixmap, xwindow, screenGC, x, 0, 22 * TILEX - x, y - 2 * TILEY, SX, SY + 14 * TILEY - y); - XCopyArea(display, screenPixmap, xwindow, screenGC, 0, 0, x - 2 * TILEX, y - 2 * TILEY, SX + 22 * TILEX - x, SY + 14 * TILEY - y); - } - - XCopyArea(display, scorePixmap, xwindow, scoreGC, 0, 0, 20 * TILEX, SCOREY, SX, SY + 12 * TILEY); - XFlush(display); - - xdebug("blitscreen - done"); + XFlush(display); } + /* draw differences between game tiles and screen tiles * * implicitly handles scrolling and restoring background under the sprites * * perhaps use mit-shm to speed this up */ + static void animscreen(void) { - unsigned int x, y, dx, dy; - unsigned short obj; - unsigned int left = screen_x / TILEX; - unsigned int top = screen_y / TILEY; - - xdebug("animscreen"); - - for (y = top; y < top + 14; y++) { - dy = y % 14; - for (x = left; x < left + 22; x++) { - dx = x % 22; - obj = map_obj[frame][Draw[y][x]]; - if (screentiles[dy][dx] != obj) { - screentiles[dy][dx] = obj; - XCopyArea(display, objPixmap, screenPixmap, screenGC, (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY, dx * TILEX, dy * TILEY); - } - } - } + unsigned int x, y, dx, dy; + unsigned short obj; + unsigned int left = screen_x / TILEX; + unsigned int top = screen_y / TILEY; + + for (y = top; y < top + MAX_BUF_YSIZE; y++) + { + dy = y % MAX_BUF_YSIZE; + for (x = left; x < left + MAX_BUF_XSIZE; x++) + { + dx = x % MAX_BUF_XSIZE; + obj = map_obj[frame][Draw[y][x]]; + + if (screentiles[dy][dx] != obj) + { + screentiles[dy][dx] = obj; + BlitBitmap(objBitmap, screenBitmap, + (obj / 512) * TILEX, (obj % 512) * TILEY / 16, + TILEX, TILEY, dx * TILEX, dy * TILEY); + } + } + } } + /* blit players to the screen * * handles transparency and movement */ + static void blitplayer(struct PLAYER *ply) { unsigned int x, y, dx, dy; unsigned short obj, spr; - xdebug("blitplayer"); - if (ply->alive) { x = (frame * ply->oldx + (8 - frame) * ply->x) * TILEX / 8; @@ -133,14 +125,14 @@ static void blitplayer(struct PLAYER *ply) dx = x + TILEX - 1; dy = y + TILEY - 1; - if ((unsigned int)(dx - screen_x) < (21 * TILEX - 1) && - (unsigned int)(dy - screen_y) < (13 * 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 %= 22 * TILEX; - y %= 14 * TILEY; - dx %= 22 * TILEX; - dy %= 14 * TILEY; + x %= MAX_BUF_XSIZE * TILEX; + y %= MAX_BUF_YSIZE * TILEY; + dx %= MAX_BUF_XSIZE * TILEX; + dy %= MAX_BUF_YSIZE * TILEY; if (objmaskBitmap) { @@ -152,7 +144,8 @@ static void blitplayer(struct PLAYER *ply) obj = screentiles[dy / TILEY][dx / TILEX]; XCopyArea(display, objmaskBitmap, spriteBitmap, spriteGC, (obj / 512) * TILEX, (obj % 512) * TILEY / 16, TILEX, TILEY, - (22 * TILEX - x) % TILEX, (14 * TILEY - y) % TILEY); + (MAX_BUF_XSIZE * TILEX - x) % TILEX, + (MAX_BUF_YSIZE * TILEY - y) % TILEY); } else if (sprmaskBitmap) { @@ -167,235 +160,126 @@ static void blitplayer(struct PLAYER *ply) screentiles[y / TILEY][x / TILEX] = -1; /* mark screen as dirty */ screentiles[dy / TILEY][dx / TILEX] = -1; +#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); + +#else + + XSetClipMask(display, 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); + + XSetClipOrigin(display, sprBitmap->stored_clip_gc, + 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, + 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); + +#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 - 22 * TILEX, y); + XSetClipOrigin(display, screenGC, x - MAX_BUF_XSIZE * TILEX, y); XCopyArea(display, sprPixmap, screenPixmap, screenGC, (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x - 22 * TILEX, y); - XSetClipOrigin(display, screenGC, x, y - 14 * 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 - 14 * TILEY); + x, y - MAX_BUF_YSIZE * TILEY); XSetClipMask(display, screenGC, None); + +#endif } } } void game_initscreen(void) { - unsigned int x,y; - - xdebug("game_initscreen"); - - frame = 6; - screen_x = 0; - screen_y = 0; - - for (y = 0; y < 14; y++) { - for (x = 0; x < 22; x++) { - screentiles[y][x] = -1; - } - } - - colour_shuffle(); - colours[0] += 16; - colours[1] += 16; - colours[2] += 16; - colour_anim = 0; - - XFillRectangle(display, scorePixmap, scoreGC, 0, 0, 20 * TILEX, SCOREY); - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 11 * SCOREX, colours[0] * SCOREY, 3 * SCOREX, SCOREY, 1 * SCOREX, 0); /* 0-63 time */ - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 18 * SCOREX, colours[0] * SCOREY, 6 * SCOREX, SCOREY, 15 * SCOREX, 0); /* 112-207 diamonds */ - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 14 * SCOREX, colours[0] * SCOREY, 4 * SCOREX, SCOREY, 32 * SCOREX, 0); /* 256-319 score */ -} - -void game_blitscore(void) -{ - unsigned int i; - - xdebug("game_blitscore"); - - i = (lev.time + 4) / 5; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 7 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 6 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 5 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 4 * SCOREX, 0); - i = lev.score; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 39 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 38 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 37 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 36 * SCOREX, 0); - if (lev.home == 0) { - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 12 * SCOREX, 24 * SCOREY, 12 * SCOREX, SCOREY, 14 * SCOREX, 0); /* relax */ - goto done; - } - if (ply1.alive + ply2.alive >= lev.home && lev.required == 0) { - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 24 * SCOREX, colours[2] * SCOREY, 12 * SCOREX, SCOREY, 14 * SCOREX, 0); /* find the exit */ - goto done; - } - if (ply1.alive + ply2.alive < lev.home) { - if (++colour_anim > 11) colour_anim = 0; - if (colour_anim < 6) { - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 0, 24 * SCOREY, 12 * SCOREX, SCOREY, 14 * SCOREX, 0); /* forget it */ - goto done; - } - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 18 * SCOREX, colours[0] * SCOREY, 6 * SCOREX, SCOREY, 15 * SCOREX, 0); /* diamonds */ - } - i = lev.required; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 24 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 23 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 22 * SCOREX, 0); i /= 10; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, 21 * SCOREX, 0); -done: -} - -void game_animscreen(void) -{ - unsigned int x,y; - - xdebug("game_animscreen"); - - x = (frame * ply1.oldx + (8 - frame) * ply1.x) * TILEX / 8 + (19 * TILEX) / 2; - y = (frame * ply1.oldy + (8 - frame) * ply1.y) * TILEY / 8 + (11 * TILEY) / 2; - if (x > lev.width * TILEX) x = lev.width * TILEX; - if (y > lev.height * TILEY) y = lev.height * TILEY; - if (x < 20 * TILEX) x = 20 * TILEY; - if (y < 12 * TILEY) y = 12 * TILEY; - screen_x = x - 19 * TILEX; - screen_y = y - 11 * TILEY; - - animscreen(); - blitplayer(&ply1); - blitplayer(&ply2); - blitscreen(); - XFlush(display); - - Random = Random * 129 + 1; -} - -void title_initscreen(void) -{ - xdebug("title_initscreen"); - - screen_x = 0; - screen_y = 0; - - colour_shuffle(); - colours[1] += 8; - colour_anim = 0; - - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, 0, 0, 20 * TILEX, 12 * TILEY, 0, 0); - if (botmaskBitmap) { - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 0, colours[1] * SCOREY, 20 * TILEX, SCOREY, 0, 0); - XSetClipMask(display, scoreGC, botmaskBitmap); - XSetClipOrigin(display, scoreGC, 0, 0 - colours[0] * SCOREY); - } - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 0, colours[0] * SCOREY, 20 * TILEX, SCOREY, 0, 0); - if (botmaskBitmap) { - XSetClipMask(display, scoreGC, None); - } -} + unsigned int x,y; -void title_blitscore(void) -{ - unsigned int x, y, i; - - xdebug("title_blitscore"); - - if (++colour_anim > 30) colour_anim = 0; - i = colour_anim >= 16 ? 31 - colour_anim : colour_anim; - x = (i / 8 + 18) * 2 * SCOREX; - y = (i % 8 + 16) * SCOREY; - - if (botmaskBitmap) { - XCopyArea(display, botPixmap, scorePixmap, scoreGC, 32 * SCOREX, colours[1] * SCOREY, 2 * SCOREX, SCOREY, 32 * SCOREX, 0); - XSetClipMask(display, scoreGC, botmaskBitmap); - XSetClipOrigin(display, scoreGC, 32 * SCOREX - x, 0 - y); - } - XCopyArea(display, botPixmap, scorePixmap, scoreGC, x, y, 2 * SCOREX, SCOREY, 32 * SCOREX, 0); - if (botmaskBitmap) { - XSetClipMask(display, scoreGC, None); - } -} + frame = 6; + screen_x = 0; + screen_y = 0; -void title_blitants(unsigned int y) -{ - static const char ants_dashes[2] = { 8, 7 }; - - xdebug("title_blitants"); - - XSetDashes(display, antsGC, colour_anim, ants_dashes, 2); - XDrawRectangle(display, screenPixmap, antsGC, 0, y * TILEY, 20 * TILEX - 1, TILEY - 1); -} - -void title_animscreen(void) -{ - blitscreen(); - XFlush(display); + for (y = 0; y < MAX_BUF_YSIZE; y++) + for (x = 0; x < MAX_BUF_XSIZE; x++) + screentiles[y][x] = -1; - Random = Random * 129 + 1; + DrawGameDoorValues_EM(lev.required, ply1.dynamite, lev.score, + (lev.time + 4) / 5); } -static int ttl_map[] = -{ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, - -1,0,-1,-1,-1,-1,-1,1,-1,-1,-1,-1,2,3,4,-1, /* !',-. */ - 5,6,7,8,9,10,11,12,13,14,15,-1,-1,-1,-1,16, /* 0123456789:? */ - -1,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, /* ABCDEFGHIJKLMNO */ - 32,33,34,35,36,37,38,39,40,41,42,-1,-1,-1,-1,-1, /* PQRSTUVWXYZ */ - -1,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, /* abcdefghijklmno */ - 32,33,34,35,36,37,38,39,40,41,42,-1,-1,-1,-1,-1 /* pqrstuvwxyz */ -}; - -void title_string(unsigned int y, unsigned int left, unsigned int right, - char *string) +void game_animscreen(void) { - int i; - unsigned int x; - - xdebug("title_string"); + unsigned int x,y; - y *= TILEY; - left *= SCOREX; - right *= SCOREX; + x = (frame * ply1.oldx + (8 - frame) * ply1.x) * TILEX / 8 + + ((SCR_FIELDX - 1) * TILEX) / 2; + y = (frame * ply1.oldy + (8 - frame) * ply1.y) * TILEY / 8 + + ((SCR_FIELDY - 1) * TILEY) / 2; - x = (left + right - strlen(string) * MENUFONTX) / 2; - if (x < left || x >= right) x = left; + if (x > lev.width * TILEX) + x = lev.width * TILEX; + if (y > lev.height * TILEY) + y = lev.height * TILEY; - /* restore background graphic where text will be drawn */ - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, - left, y, right - left, MENUFONTY, left, y); - - if (ttlmaskBitmap) - XSetClipMask(display, screenGC, ttlmaskBitmap); - - for (i = 0; string[i] && x < right; i++) - { - int ch_pos, ch_x, ch_y; + if (x < SCR_FIELDX * TILEX) + x = SCR_FIELDX * TILEY; + if (y < SCR_FIELDY * TILEY) + y = SCR_FIELDY * TILEY; - ch_pos = ttl_map[string[i] & 127]; + screen_x = x - (SCR_FIELDX - 1) * TILEX; + screen_y = y - (SCR_FIELDY - 1) * TILEY; - if (ch_pos == -1 || ch_pos > 22 * 2) - continue; /* no graphic for this character */ - - ch_x = (ch_pos % 22) * GFXMENUFONTX; - ch_y = (ch_pos / 22 + 12) * TILEY; - - if (ttlmaskBitmap) - XSetClipOrigin(display, screenGC, x - ch_x, y - ch_y); - - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, - ch_x, ch_y, MENUFONTX, MENUFONTY, x, y); - - x += MENUFONTX; - } + animscreen(); + blitplayer(&ply1); + blitplayer(&ply2); + blitscreen(); - XSetClipMask(display, screenGC, None); + XFlush(display); } #endif