X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=236b8289bfbdff7a8b837e2e338d2ef0613c968d;hb=d14ff3d04c44d90b4dc151fd7774946e20da0152;hp=483d63b5044a43be5cbcb29c414a0b2a004bf68e;hpb=095207353ef58a65f5146e6ddc7eefb51bfe0f55;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 483d63b5..236b8289 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -3,598 +3,537 @@ * graphics manipulation crap */ -#include -#include - #include "global.h" #include "display.h" #include "level.h" -#include - +#define MIN_SCREEN_XPOS 1 +#define MIN_SCREEN_YPOS 1 +#define MAX_SCREEN_XPOS MAX(1, lev.width - (SCR_FIELDX - 1)) +#define MAX_SCREEN_YPOS MAX(1, lev.height - (SCR_FIELDY - 1)) -#if defined(TARGET_X11) +#define MIN_SCREEN_X (MIN_SCREEN_XPOS * TILEX) +#define MIN_SCREEN_Y (MIN_SCREEN_YPOS * TILEY) +#define MAX_SCREEN_X (MAX_SCREEN_XPOS * TILEX) +#define MAX_SCREEN_Y (MAX_SCREEN_YPOS * TILEY) -unsigned int frame; /* current frame */ -unsigned int screen_x; /* current scroll position */ -unsigned int screen_y; +#define VALID_SCREEN_X(x) ((x) < MIN_SCREEN_X ? MIN_SCREEN_X : \ + (x) > MAX_SCREEN_X ? MAX_SCREEN_X : (x)) +#define VALID_SCREEN_Y(y) ((y) < MIN_SCREEN_Y ? MIN_SCREEN_Y : \ + (y) > MAX_SCREEN_Y ? MAX_SCREEN_Y : (y)) -static unsigned short screentiles[14][22]; /* tiles currently on screen */ +#define PLAYER_SCREEN_X(p) ((( frame) * ply[p].oldx + \ + (8 - frame) * ply[p].x) * TILEX / 8 \ + - ((SCR_FIELDX - 1) * TILEX) / 2) +#define PLAYER_SCREEN_Y(p) ((( frame) * ply[p].oldy + \ + (8 - frame) * ply[p].y) * TILEY / 8 \ + - ((SCR_FIELDY - 1) * TILEY) / 2) -static unsigned int colours[8]; -static unsigned int colour_anim; -static void xdebug(char *msg) -{ +int frame; /* current screen frame */ #if 0 - XSync(display, False); - printf("EM DEBUG: %s\n", msg); +int screen_x; /* current scroll position */ +int screen_y; +#else +int screen_x; /* current scroll position */ +int screen_y; #endif -} -static void colour_shuffle(void) -{ - unsigned int i, j, k; +/* tiles currently on screen */ +static int screentiles[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; +static int crumbled_state[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; - for (i = 0; i < 8; i++) - colours[i] = i; +static boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; - 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"); +void BlitScreenToBitmap_EM(Bitmap *target_bitmap) +{ + int x = screen_x % (MAX_BUF_XSIZE * TILEX); + int y = screen_y % (MAX_BUF_YSIZE * TILEY); if (x < 2 * TILEX && y < 2 * TILEY) { - BlitBitmap(screenBitmap, window, x, y, - 20 * TILEX, 12 * TILEY, SX, SY); + 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, - 20 * TILEX, 14 * TILEY - y, SX, SY); - BlitBitmap(screenBitmap, window, x, 0, - 20 * TILEX, y - 2 * TILEY, SX, SY + 14 * TILEY - y); + BlitBitmap(screenBitmap, target_bitmap, x, y, + SCR_FIELDX * TILEX, MAX_BUF_YSIZE * TILEY - y, + SX, SY); + 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, - 22 * TILEX - x, 12 * TILEY, SX, SY); - BlitBitmap(screenBitmap, window, 0, y, - x - 2 * TILEX, 12 * TILEY, SX + 22 * TILEX - x, SY); + BlitBitmap(screenBitmap, target_bitmap, x, y, + MAX_BUF_XSIZE * TILEX - x, SCR_FIELDY * TILEY, + SX, SY); + 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, - 22 * TILEX - x, 14 * TILEY - y, SX, SY); - BlitBitmap(screenBitmap, window, 0, y, - x - 2 * TILEX, 14 * TILEY - y, SX + 22 * TILEX - x, SY); - BlitBitmap(screenBitmap, window, x, 0, - 22 * TILEX - x, y - 2 * TILEY, SX, SY + 14 * TILEY - y); - BlitBitmap(screenBitmap, window, 0, 0, + BlitBitmap(screenBitmap, target_bitmap, x, y, + MAX_BUF_XSIZE * TILEX - x, MAX_BUF_YSIZE * TILEY - y, + SX, SY); + BlitBitmap(screenBitmap, target_bitmap, 0, y, + x - 2 * TILEX, MAX_BUF_YSIZE * TILEY - y, + SX + MAX_BUF_XSIZE * TILEX - x, SY); + BlitBitmap(screenBitmap, target_bitmap, x, 0, + MAX_BUF_XSIZE * TILEX - x, y - 2 * TILEY, + SX, SY + MAX_BUF_YSIZE * TILEY - y); + BlitBitmap(screenBitmap, target_bitmap, 0, 0, x - 2 * TILEX, y - 2 * TILEY, - SX + 22 * TILEX - x, SY + 14 * TILEY - y); + SX + MAX_BUF_XSIZE * TILEX - x, SY + MAX_BUF_YSIZE * TILEY - y); } - - BlitBitmap(scoreBitmap, window, 0, 0, - 20 * TILEX, SCOREY, SX, SY + 12 * TILEY); - XFlush(display); - - xdebug("blitscreen - done"); } -/* 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) +void blitscreen(void) { - unsigned int x, y, dx, dy; - unsigned short obj; - unsigned int left = screen_x / TILEX; - unsigned int top = screen_y / TILEY; +#if 1 + + static boolean scrolling_last = FALSE; + int left = screen_x / TILEX; + int top = screen_y / TILEY; + boolean scrolling = (screen_x % TILEX != 0 || screen_y % TILEY != 0); + int x, y; - xdebug("animscreen"); + SyncDisplay(); - for (y = top; y < top + 14; y++) + if (redraw_tiles > REDRAWTILES_THRESHOLD || scrolling || scrolling_last) { - dy = y % 14; - for (x = left; x < left + 22; x++) - { - dx = x % 22; - obj = map_obj[frame][Draw[y][x]]; + /* blit all (up to four) parts of the scroll buffer to the backbuffer */ + BlitScreenToBitmap_EM(backbuffer); - 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 the completely updated backbuffer to the window (in one blit) */ + BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY); } -} - -/* 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) + else { - 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) < (21 * TILEX - 1) && - (unsigned int)(dy - screen_y) < (13 * TILEY - 1)) + for (x = 0; x < SCR_FIELDX; x++) { - spr = map_spr[ply->num][frame][ply->anim]; - x %= 22 * TILEX; - y %= 14 * TILEY; - dx %= 22 * TILEX; - dy %= 14 * 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, - (22 * TILEX - x) % TILEX, (14 * TILEY - y) % TILEY); - } - else if (sprmaskBitmap) - { - XCopyArea(display, sprmaskBitmap, spriteBitmap, spriteGC, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, 0, 0); - } - else + for (y = 0; y < SCR_FIELDY; y++) { - 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 1 + 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); + } + } + } -#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 - 22 * TILEX, y); - BlitBitmapMasked(sprBitmap, screenBitmap, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x - 22 * TILEX, y); - - SetClipOrigin(sprBitmap, sprBitmap->stored_clip_gc, x, y - 14 * TILEY); - BlitBitmapMasked(sprBitmap, screenBitmap, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x, y - 14 * TILEY); + for (x = 0; x < MAX_BUF_XSIZE; x++) + for (y = 0; y < MAX_BUF_YSIZE; y++) + redraw[x][y] = FALSE; + redraw_tiles = 0; - SetClipMask(sprBitmap, sprBitmap->stored_clip_gc, None); + scrolling_last = scrolling; #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 - 22 * TILEX, y); - XCopyArea(display, sprBitmap->drawable, screenBitmap->drawable, - sprBitmap->stored_clip_gc, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x - 22 * TILEX, y); - - XSetClipOrigin(display, sprBitmap->stored_clip_gc, x, y - 14 * TILEY); - XCopyArea(display, sprBitmap->drawable, screenBitmap->drawable, - sprBitmap->stored_clip_gc, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x, y - 14 * TILEY); - - XSetClipMask(display, sprBitmap->stored_clip_gc, None); + /* blit all (up to four) parts of the scroll buffer to the window */ + BlitScreenToBitmap_EM(window); #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); - XCopyArea(display, sprPixmap, screenPixmap, screenGC, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x - 22 * TILEX, y); - XSetClipOrigin(display, screenGC, x, y - 14 * TILEY); - XCopyArea(display, sprPixmap, screenPixmap, screenGC, - (spr / 8) * TILEX, (spr % 8) * TILEY, TILEX, TILEY, - x, y - 14 * TILEY); - XSetClipMask(display, screenGC, None); - -#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); + } } -void game_initscreen(void) +static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, + int crm, boolean draw_masked) { - unsigned int x,y; + int tile = Draw[y][x]; + struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; + int i; - xdebug("game_initscreen"); + if (crm == 0) /* no crumbled edges for this tile */ + return; - frame = 6; - screen_x = 0; - screen_y = 0; + for (i = 0; i < 4; i++) + { + if (crm & (1 << i)) + { + int width, height, cx, cy; - for (y = 0; y < 14; y++) - for (x = 0; x < 22; x++) - screentiles[y][x] = -1; + 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); + } - colour_shuffle(); - colours[0] += 16; - colours[1] += 16; - colours[2] += 16; - colour_anim = 0; - - ClearRectangle(scoreBitmap, 0, 0, 20 * TILEX, SCOREY); - BlitBitmap(botBitmap, scoreBitmap, - 11 * SCOREX, colours[0] * SCOREY, 3 * SCOREX, SCOREY, - 1 * SCOREX, 0); /* 0-63 time */ - BlitBitmap(botBitmap, scoreBitmap, - 18 * SCOREX, colours[0] * SCOREY, 6 * SCOREX, SCOREY, - 15 * SCOREX, 0); /* 112-207 diamonds */ - BlitBitmap(botBitmap, scoreBitmap, - 14 * SCOREX, colours[0] * SCOREY, 4 * SCOREX, SCOREY, - 32 * SCOREX, 0); /* 256-319 score */ + 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); + } + } + } } -void game_blitscore(void) +static void DrawLevelPlayer_EM(int x1, int y1, int player_nr, int anim, + boolean draw_masked) { - unsigned int i; - - xdebug("game_blitscore"); - - i = (lev.time + 4) / 5; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 7 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 6 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 5 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 4 * SCOREX, 0); - - i = lev.score; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 39 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 38 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 37 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 36 * SCOREX, 0); - - if (lev.home == 0) - { - BlitBitmap(botBitmap, scoreBitmap, - 12 * SCOREX, 24 * SCOREY, 12 * SCOREX, SCOREY, - 14 * SCOREX, 0); /* relax */ + struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame]; - goto done; - } + int src_x = g->src_x, src_y = g->src_y; + int dst_x, dst_y; - if (ply1.alive + ply2.alive >= lev.home && lev.required == 0) + if (draw_masked) { - BlitBitmap(botBitmap, scoreBitmap, - 24 * SCOREX, colours[2] * SCOREY, 12 * SCOREX, SCOREY, - 14 * SCOREX, 0); /* find the exit */ - - goto done; + /* 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); } - - if (ply1.alive + ply2.alive < lev.home) + else { - if (++colour_anim > 11) - colour_anim = 0; - - if (colour_anim < 6) - { - BlitBitmap(botBitmap, scoreBitmap, - 0, 24 * SCOREY, 12 * SCOREX, SCOREY, - 14 * SCOREX, 0); /* forget it */ - - goto done; - } - - BlitBitmap(botBitmap, scoreBitmap, - 18 * SCOREX, colours[0] * SCOREY, 6 * SCOREX, SCOREY, - 15 * SCOREX, 0); /* diamonds */ + /* 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); } - - i = lev.required; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 24 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 23 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 22 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 21 * SCOREX, 0); - - done: } -void game_animscreen(void) +/* 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; + int x, y, i; + int left = screen_x / TILEX; + int top = screen_y / TILEY; + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; - xdebug("game_animscreen"); + for (y = top; y < top + MAX_BUF_YSIZE; y++) + { + for (x = left; x < left + MAX_BUF_XSIZE; x++) + { + 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]; + int obj = g->unique_identifier; + int crm = 0; + + /* re-calculate crumbled state of this tile */ + if (g->has_crumbled_graphics) + { + for (i = 0; i < 4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int tile_next; - 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 (xx < 0 || xx >= EM_MAX_CAVE_WIDTH || + yy < 0 || yy >= EM_MAX_CAVE_HEIGHT) + continue; - 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; + tile_next = Draw[yy][xx]; - screen_x = x - 19 * TILEX; - screen_y = y - 11 * TILEY; + if (!graphic_info_em_object[tile_next][frame].has_crumbled_graphics) + crm |= (1 << i); + } + } - animscreen(); - blitplayer(&ply1); - blitplayer(&ply2); - blitscreen(); + /* only redraw screen tiles if they (or their crumbled state) changed */ + if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm) + { + DrawLevelField_EM(x, y, sx, sy, FALSE); + DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE); - XFlush(display); + screentiles[sy][sx] = obj; + crumbled_state[sy][sx] = crm; - Random = Random * 129 + 1; + redraw[sx][sy] = TRUE; + redraw_tiles++; + } + } + } } -void title_initscreen(void) -{ - xdebug("title_initscreen"); - - screen_x = 0; - screen_y = 0; - colour_shuffle(); - colours[1] += 8; - colour_anim = 0; - -#if 1 - - BlitBitmap(ttlBitmap, screenBitmap, - 0, 0, 20 * TILEX, 12 * TILEY, 0, 0); - - if (botmaskBitmap) - { - BlitBitmap(botBitmap, scoreBitmap, - 0, colours[1] * SCOREY, 20 * TILEX, SCOREY, 0, 0); - - SetClipOrigin(botBitmap, botBitmap->stored_clip_gc, - 0, 0 - colours[0] * SCOREY); - } +/* blit players to the screen + * + * handles transparency and movement + */ - BlitBitmapMasked(botBitmap, scoreBitmap, - 0, colours[0] * SCOREY, 20 * TILEX, SCOREY, 0, 0); +static void blitplayer(struct PLAYER *ply) +{ + int x1, y1, x2, y2; -#else + if (!ply->alive) + return; - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, - 0, 0, 20 * TILEX, 12 * TILEY, 0, 0); + /* 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; + x2 = x1 + TILEX - 1; + y2 = y1 + TILEY - 1; - if (botmaskBitmap) + if ((int)(x2 - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) && + (int)(y2 - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1)) { - 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); - } + /* 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]; - XCopyArea(display, botPixmap, scorePixmap, scoreGC, - 0, colours[0] * SCOREY, 20 * TILEX, SCOREY, 0, 0); + /* only diggable elements can be crumbled in the classic EM engine */ + boolean player_is_digging = (new_crm != 0); - if (botmaskBitmap) - XSetClipMask(display, scoreGC, None); + x1 %= MAX_BUF_XSIZE * TILEX; + y1 %= MAX_BUF_YSIZE * TILEY; + x2 %= MAX_BUF_XSIZE * TILEX; + y2 %= MAX_BUF_YSIZE * TILEY; + if (player_is_digging) + { +#if 0 + /* 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 -} -void title_blitscore(void) -{ - unsigned int x, y, i; + /* 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); - xdebug("title_blitscore"); + /* draw the player (masked) over the element he is just digging away */ + DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, TRUE); - if (++colour_anim > 30) - colour_anim = 0; +#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 + { + /* draw the player under the element which is on the same field */ + DrawLevelPlayer_EM(x1, y1, ply->num, ply->anim, FALSE); - i = colour_anim >= 16 ? 31 - colour_anim : colour_anim; - x = (i / 8 + 18) * 2 * SCOREX; - y = (i % 8 + 16) * SCOREY; + /* draw the field the player is moving from (masked over the player) */ + DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE); -#if 1 - if (botmaskBitmap) - { - BlitBitmap(botBitmap, scoreBitmap, - 32 * SCOREX, colours[1] * SCOREY, 2 * SCOREX, SCOREY, - 32 * SCOREX, 0); + /* draw the field the player is moving to (masked over the player) */ + DrawLevelField_EM(new_x, new_y, new_sx, new_sy, TRUE); + } - SetClipOrigin(botBitmap, botBitmap->stored_clip_gc, - 32 * SCOREX - x, 0 - y); + /* mark screen tiles as dirty */ + screentiles[old_sy][old_sx] = -1; + screentiles[new_sy][new_sx] = -1; } +} - BlitBitmapMasked(botBitmap, scoreBitmap, - x, y, 2 * SCOREX, SCOREY, 32 * SCOREX, 0); +void game_initscreen(void) +{ + 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; + int player_nr = 0; /* !!! FIX THIS (CENTERED TO PLAYER 1) !!! */ + frame = 6; +#if 1 + screen_x = VALID_SCREEN_X(PLAYER_SCREEN_X(player_nr)); + screen_y = VALID_SCREEN_Y(PLAYER_SCREEN_Y(player_nr)); #else + screen_x = 0; + screen_y = 0; +#endif - if (botmaskBitmap) + for (y = 0; y < MAX_BUF_YSIZE; y++) { - 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); + for (x = 0; x < MAX_BUF_XSIZE; x++) + { + screentiles[y][x] = -1; + crumbled_state[y][x] = 0; + } } - XCopyArea(display, botPixmap, scorePixmap, scoreGC, - x, y, 2 * SCOREX, SCOREY, 32 * SCOREX, 0); - - if (botmaskBitmap) - XSetClipMask(display, scoreGC, None); +#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 title_blitants(unsigned int y) +void RedrawPlayfield_EM() { - 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); -} + int player_nr = 0; /* !!! FIX THIS (CENTERED TO PLAYER 1) !!! */ + int sx = PLAYER_SCREEN_X(player_nr); + int sy = PLAYER_SCREEN_Y(player_nr); + int i; -void title_animscreen(void) -{ - blitscreen(); - XFlush(display); +#if 1 - Random = Random * 129 + 1; -} + int offset = (setup.scroll_delay ? 3 : 0) * TILEX; -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) -{ - int i; - unsigned int x; + /* calculate new screen scrolling position, with regard to scroll delay */ + screen_x = VALID_SCREEN_X(sx + offset < screen_x ? sx + offset : + sx - offset > screen_x ? sx - offset : screen_x); + screen_y = VALID_SCREEN_Y(sy + offset < screen_y ? sy + offset : + sy - offset > screen_y ? sy - offset : screen_y); - xdebug("title_string"); +#else - y *= TILEY; - left *= SCOREX; - right *= SCOREX; + if (sx > lev.width * TILEX) + sx = lev.width * TILEX; + if (sy > lev.height * TILEY) + sy = lev.height * TILEY; - x = (left + right - strlen(string) * MENUFONTX) / 2; - if (x < left || x >= right) x = left; + if (sx < SCR_FIELDX * TILEX) + sx = SCR_FIELDX * TILEY; + if (sy < SCR_FIELDY * TILEY) + sy = SCR_FIELDY * TILEY; - /* restore background graphic where text will be drawn */ - BlitBitmap(ttlBitmap, screenBitmap, - left, y, right - left, MENUFONTY, left, y); + screen_x = sx - (SCR_FIELDX - 1) * TILEX; + screen_y = sy - (SCR_FIELDY - 1) * TILEY; -#if 1 -#else - if (ttlmaskBitmap) - XSetClipMask(display, screenGC, ttlmaskBitmap); #endif - for (i = 0; string[i] && x < right; i++) - { - int ch_pos, ch_x, ch_y; - - ch_pos = ttl_map[string[i] & 127]; - - if (ch_pos == -1 || ch_pos > 22 * 2) - continue; /* no graphic for this character */ + animscreen(); - ch_x = (ch_pos % 22) * GFXMENUFONTX; - ch_y = (ch_pos / 22 + 12) * TILEY; + for (i = 0; i < MAX_PLAYERS; i++) + blitplayer(&ply[i]); -#if 1 - SetClipOrigin(ttlBitmap, ttlBitmap->stored_clip_gc, - x - ch_x, y - ch_y); + blitscreen(); - BlitBitmapMasked(ttlBitmap, screenBitmap, - ch_x, ch_y, MENUFONTX, MENUFONTY, x, y); -#else - if (ttlmaskBitmap) - XSetClipOrigin(display, screenGC, x - ch_x, y - ch_y); + FlushDisplay(); +} - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, - ch_x, ch_y, MENUFONTX, MENUFONTY, x, y); -#endif +void game_animscreen(void) +{ + RedrawPlayfield_EM(); +} - x += MENUFONTX; - } +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 - XSetClipMask(display, screenGC, None); + DrawAllGameValues(lev.required, ply1.dynamite, lev.score, + DISPLAY_TIME(lev.time), ply1.keys | ply2.keys); #endif } - -#endif