X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=398ae6e0e303254f319e69931debc5d4b8b0b291;hb=HEAD;hp=70c45c5393c897cdbce907ec87d7defc02cbc936;hpb=b19246464046dd481ab0e9bd133ba09b9d0b0300;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 70c45c53..a3e941a5 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -3,155 +3,364 @@ * graphics manipulation crap */ -#include -#include +#include "main_em.h" -#include "global.h" -#include "display.h" -#include "level.h" +#define MIN_SCREEN_XPOS_RAW 0 +#define MIN_SCREEN_YPOS_RAW 0 +#define MAX_SCREEN_XPOS_RAW MAX(0, lev.width - SCR_FIELDX) +#define MAX_SCREEN_YPOS_RAW MAX(0, lev.height - SCR_FIELDY) -#include +#define MIN_SCREEN_XPOS (MIN_SCREEN_XPOS_RAW + CAVE_BUFFER_XOFFSET) +#define MIN_SCREEN_YPOS (MIN_SCREEN_YPOS_RAW + CAVE_BUFFER_YOFFSET) +#define MAX_SCREEN_XPOS (MAX_SCREEN_XPOS_RAW + CAVE_BUFFER_XOFFSET) +#define MAX_SCREEN_YPOS (MAX_SCREEN_YPOS_RAW + CAVE_BUFFER_YOFFSET) +#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) -#if defined(TARGET_X11) +#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)) -unsigned int frame; /* current frame */ -unsigned int screen_x; /* current scroll position */ -unsigned int screen_y; +#define PLAYER_POS_X(nr) (((7 - frame) * ply[nr].prev_x + \ + (1 + frame) * ply[nr].x) * TILEX / 8) +#define PLAYER_POS_Y(nr) (((7 - frame) * ply[nr].prev_y + \ + (1 + frame) * ply[nr].y) * TILEY / 8) + +#define PLAYER_SCREEN_X(nr) (PLAYER_POS_X(nr) - \ + (SCR_FIELDX - 1) * TILEX / 2) +#define PLAYER_SCREEN_Y(nr) (PLAYER_POS_Y(nr) - \ + (SCR_FIELDY - 1) * TILEY / 2) + +#define USE_EXTENDED_GRAPHICS_ENGINE 1 + + +int frame; /* current screen frame */ +int screen_x, screen_y; /* current scroll position */ /* tiles currently on screen */ -static unsigned short screentiles[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; +static int screen_tiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2]; +static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2]; -static unsigned int colours[8]; -static unsigned int colour_anim; +/* graphic info for game objects/frames and players/actions/frames */ +struct GraphicInfo_EM graphic_info_em_object[GAME_TILE_MAX][8]; +struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8]; -static void xdebug(char *msg) +static struct XY xy_topdown[] = { -#if 0 - XSync(display, False); - printf("EM DEBUG: %s\n", msg); -#endif -} + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } +}; + +static void setScreenCenteredToAllPlayers(int *, int *); -static void colour_shuffle(void) +int getFieldbufferOffsetX_EM(void) { - unsigned int i, j, k; + return screen_x % TILEX; +} - for (i = 0; i < 8; i++) - colours[i] = i; +int getFieldbufferOffsetY_EM(void) +{ + return screen_y % TILEY; +} - for (i = 0; i < 8; i++) +void BlitScreenToBitmap_EM(Bitmap *target_bitmap) +{ + /* blit all (up to four) parts of the scroll buffer to the target bitmap */ + + int x = screen_x % (MAX_BUF_XSIZE * TILEX); + int y = screen_y % (MAX_BUF_YSIZE * TILEY); + int xsize = SXSIZE; + int ysize = SYSIZE; + int full_xsize = lev.width * TILEX; + int full_ysize = lev.height * TILEY; + int sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); + int sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + int sxsize = (full_xsize < xsize ? full_xsize : xsize); + int sysize = (full_ysize < ysize ? full_ysize : ysize); + int xxsize = MAX_BUF_XSIZE * TILEX - x; + int yysize = MAX_BUF_YSIZE * TILEY - y; + int xoffset = 2 * CAVE_BUFFER_XOFFSET * TILEX; + int yoffset = 2 * CAVE_BUFFER_YOFFSET * TILEY; + + if (x < xoffset && y < yoffset) + { + BlitBitmap(screenBitmap, target_bitmap, x, y, sxsize, sysize, + sx, sy); + } + else if (x < xoffset && y >= yoffset) + { + BlitBitmap(screenBitmap, target_bitmap, x, y, sxsize, yysize, + sx, sy); + BlitBitmap(screenBitmap, target_bitmap, x, 0, sxsize, y - yoffset, + sx, sy + yysize); + } + else if (x >= xoffset && y < yoffset) + { + BlitBitmap(screenBitmap, target_bitmap, x, y, xxsize, sysize, + sx, sy); + BlitBitmap(screenBitmap, target_bitmap, 0, y, x - xoffset, sysize, + sx + xxsize, sy); + } + else { - Random = Random * 129 + 1; - j = (Random >> 10) & 7; - k = colours[i]; - colours[i] = colours[j]; - colours[j] = k; + BlitBitmap(screenBitmap, target_bitmap, x, y, xxsize, yysize, + sx, sy); + BlitBitmap(screenBitmap, target_bitmap, 0, y, x - xoffset, yysize, + sx + xxsize, sy); + BlitBitmap(screenBitmap, target_bitmap, x, 0, xxsize, y - yoffset, + sx, sy + yysize); + BlitBitmap(screenBitmap, target_bitmap, 0, 0, x - xoffset, y - yoffset, + sx + xxsize, sy + yysize); } } +static void BackToFront_EM(void) +{ + BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY); +} -/* copy the entire screen to the window at the scroll position - * - * perhaps use mit-shm to speed this up - */ +static struct GraphicInfo_EM *getObjectGraphic(int x, int y) +{ + int tile = lev.draw[x][y]; + struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; -void blitscreen(void) + if (!game.use_native_emc_graphics_engine) + getGraphicSourceObjectExt_EM(g, tile, frame, x - lev.left, y - lev.top); + + return g; +} + +static struct GraphicInfo_EM *getPlayerGraphic(int player_nr, int anim) { - unsigned int x = screen_x % (MAX_BUF_XSIZE * TILEX); - unsigned int y = screen_y % (MAX_BUF_YSIZE * TILEY); + struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame]; - xdebug("blitscreen"); + if (!game.use_native_emc_graphics_engine) + getGraphicSourcePlayerExt_EM(g, player_nr, anim, frame); - if (em_game_status == EM_GAME_STATUS_MENU) - { - ClearRectangle(screenBitmap, 0, SCR_MENUY * TILEY, - SCR_FIELDX * TILEX, (17 - SCR_MENUY) * TILEY); - BlitBitmap(scoreBitmap, screenBitmap, 0, 0, SCR_MENUX * TILEX, SCOREY, - 0, SCR_MENUY * TILEY); - } + return g; +} - 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) +static void DrawLevelField_EM(int x, int y, int sx, int sy, + boolean draw_masked) +{ + struct GraphicInfo_EM *g = getObjectGraphic(x, y); + int src_x = g->src_x + g->src_offset_x * TILESIZE_VAR / TILESIZE; + int src_y = g->src_y + g->src_offset_y * TILESIZE_VAR / TILESIZE; + int dst_x = sx * TILEX + g->dst_offset_x * TILESIZE_VAR / TILESIZE; + int dst_y = sy * TILEY + g->dst_offset_y * TILESIZE_VAR / TILESIZE; + int width = g->width * TILESIZE_VAR / TILESIZE; + int height = g->height * TILESIZE_VAR / TILESIZE; + int left = screen_x / TILEX; + int top = screen_y / TILEY; + + /* do not draw fields that are outside the visible screen area */ + if (x < left || x >= left + MAX_BUF_XSIZE || + y < top || y >= top + MAX_BUF_YSIZE) + return; + + if (draw_masked) { - 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); + if (width > 0 && height > 0) + BlitBitmapMasked(g->bitmap, screenBitmap, + src_x, src_y, width, height, dst_x, dst_y); } 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); + 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) +{ + struct GraphicInfo_EM *g; + int crumbled_border_size; + int left = screen_x / TILEX; + int top = screen_y / TILEY; + int i; + + /* do not draw fields that are outside the visible screen area */ + if (x < left || x >= left + MAX_BUF_XSIZE || + y < top || y >= top + MAX_BUF_YSIZE) + return; + + if (crm == 0) /* no crumbled edges for this tile */ + return; + + g = getObjectGraphic(x, y); - /* draw either the main menu footer or the in-game time/gems/score values */ + crumbled_border_size = + g->crumbled_border_size * TILESIZE_VAR / g->crumbled_tile_size; - if (em_game_status == EM_GAME_STATUS_PLAY) - BlitBitmap(scoreBitmap, window, 0, 0, SCR_FIELDX * TILEX, SCOREY, - SX, SY + SCR_FIELDY * TILEY - SCOREY); + for (i = 0; i < 4; i++) + { + if (crm & (1 << i)) + { + int width, height, cx, cy; - XFlush(display); + 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); + } - xdebug("blitscreen - done"); + 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) + 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 = getPlayerGraphic(player_nr, anim); + int src_x = g->src_x, src_y = g->src_y; + int dst_x, dst_y; + + /* do not draw fields that are outside the visible screen area */ + if (x1 < screen_x - TILEX || x1 >= screen_x + MAX_BUF_XSIZE * TILEX || + y1 < screen_y - TILEY || y1 >= screen_y + MAX_BUF_YSIZE * TILEY) + return; + + x1 %= MAX_BUF_XSIZE * TILEX; + y1 %= MAX_BUF_YSIZE * TILEY; + + if (draw_masked) + { + /* draw the player to current location */ + dst_x = x1; + dst_y = y1; + 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; + 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; + 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 * * 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"); + int x, y, i; + int left = screen_x / TILEX; + int top = screen_y / TILEY; + struct XY *xy = xy_topdown; + + if (!game.use_native_emc_graphics_engine) + for (y = lev.top; y < lev.bottom; y++) + for (x = lev.left; x < lev.right; x++) + SetGfxAnimation_EM(&graphic_info_em_object[lev.draw[x][y]][frame], + lev.draw[x][y], frame, + x - lev.left, y - lev.top); 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]]; + int sx = x % MAX_BUF_XSIZE; + int sy = y % MAX_BUF_YSIZE; + int tile = lev.draw[x][y]; + struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; + int obj = g->unique_identifier; + int crm = 0; + boolean redraw_screen_tile = FALSE; + + /* re-calculate crumbled state of this tile */ + if (g->has_crumbled_graphics) + { + for (i = 0; i < 4; i++) + { + int xx = x + xy[i].x; + int yy = y + xy[i].y; + int tile_next; + + if (xx < 0 || xx >= CAVE_BUFFER_WIDTH || + yy < 0 || yy >= CAVE_BUFFER_HEIGHT) + continue; + + tile_next = lev.draw[xx][yy]; + + if (!graphic_info_em_object[tile_next][frame].has_crumbled_graphics) + crm |= (1 << i); + } + } - if (screentiles[dy][dx] != obj) + redraw_screen_tile = (screen_tiles[sx][sy] != obj || + crumbled_state[sx][sy] != crm); + + /* only redraw screen tiles if they (or their crumbled state) changed */ + if (redraw_screen_tile) { - screentiles[dy][dx] = obj; - BlitBitmap(objBitmap, screenBitmap, - (obj / 512) * TILEX, (obj % 512) * TILEY / 16, - TILEX, TILEY, dx * TILEX, dy * TILEY); + DrawLevelField_EM(x, y, sx, sy, FALSE); + DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE); + + screen_tiles[sx][sy] = obj; + crumbled_state[sx][sy] = crm; } } } @@ -163,490 +372,468 @@ static void animscreen(void) * handles transparency and movement */ -static void blitplayer(struct PLAYER *ply) +static void blitplayer_ext(int nr) { - unsigned int x, y, dx, dy; - unsigned short obj, spr; + int x1, y1, x2, y2; - xdebug("blitplayer"); + if (!ply[nr].alive) + return; - 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; + /* x1/y1 are left/top and x2/y2 are right/down part of the player movement */ + x1 = PLAYER_POS_X(nr); + y1 = PLAYER_POS_Y(nr); + x2 = x1 + TILEX - 1; + y2 = y1 + 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)) + if ((int)(x2 - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) && + (int)(y2 - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1)) + { + /* some casts to "int" are needed because of negative calculation values */ + int dx = (int)ply[nr].x - (int)ply[nr].prev_x; + int dy = (int)ply[nr].y - (int)ply[nr].prev_y; + int old_x = (int)ply[nr].prev_x + (int)frame * dx / 8; + int old_y = (int)ply[nr].prev_y + (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_YSIZE; + int new_sx = new_x % MAX_BUF_XSIZE; + int new_sy = new_y % MAX_BUF_YSIZE; + int new_crm = crumbled_state[new_sx][new_sy]; + + /* only diggable elements can be crumbled in the classic EM engine */ + boolean player_is_digging = (new_crm != 0); + + if (player_is_digging) { - 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 1 + /* 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); + /* draw the player (masked) over the element he is just digging away */ + DrawLevelPlayer_EM(x1, y1, ply[nr].num, ply[nr].anim, TRUE); -#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 field the player is moving from (masked over the player) */ + DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE); + } + else + { + /* draw the player under the element which is on the same field */ + DrawLevelPlayer_EM(x1, y1, ply[nr].num, ply[nr].anim, FALSE); -#else + /* draw the field the player is moving from (masked over the player) */ + DrawLevelField_EM(old_x, old_y, old_sx, old_sy, TRUE); - XSetClipMask(display, sprBitmap->stored_clip_gc, spriteBitmap); + /* draw the field the player is moving to (masked over the player) */ + DrawLevelField_EM(new_x, new_y, new_sx, new_sy, TRUE); + } - 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); + /* redraw screen tiles in the next frame (player may have left the tiles) */ + screen_tiles[old_sx][old_sy] = -1; + screen_tiles[new_sx][new_sy] = -1; + } +} - 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); +static void blitplayer(int nr) +{ + blitplayer_ext(nr); - 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); + /* check for wrap-around movement ... */ + if (ply[nr].x < lev.left || + ply[nr].x > lev.right - 1) + { + struct PLAYER ply_last = ply[nr]; + int direction = (ply[nr].x < lev.left ? -1 : 1); + int dx = ply[nr].x - ply[nr].prev_x; - XSetClipMask(display, sprBitmap->stored_clip_gc, None); + ply[nr].x += -direction * lev.width; + ply[nr].prev_x = ply[nr].x - dx; -#endif + if (!lev.infinite_true) + { + int dy = ply[nr].y - ply[nr].prev_y; -#else + ply[nr].y += direction; + ply[nr].prev_y = ply[nr].y - dy; + } - 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); + /* draw player entering playfield from the opposite side */ + blitplayer_ext(nr); -#endif - } + /* ... but keep the old player position until game logic */ + ply[nr] = ply_last; } } - -/* draw static text for time, gems and score counter */ - void game_initscreen(void) { - unsigned int x,y; + int x, y, sx, sy; + + frame = 1; - xdebug("game_initscreen"); + if (game.centered_player_nr == -1) + { + setScreenCenteredToAllPlayers(&sx, &sy); + } + else + { + sx = PLAYER_SCREEN_X(game.centered_player_nr); + sy = PLAYER_SCREEN_Y(game.centered_player_nr); + } - frame = 6; - screen_x = 0; - screen_y = 0; + screen_x = VALID_SCREEN_X(sx); + screen_y = VALID_SCREEN_Y(sy); for (y = 0; y < MAX_BUF_YSIZE; y++) + { for (x = 0; x < MAX_BUF_XSIZE; x++) - screentiles[y][x] = -1; - - colour_shuffle(); - colours[0] += 16; - colours[1] += 16; - colours[2] += 16; - colour_anim = 0; - - ClearRectangle(scoreBitmap, 0, 0, SCR_FIELDX * 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, - 11 * SCOREX, 0); /* 112-207 diamonds */ - BlitBitmap(botBitmap, scoreBitmap, - 14 * SCOREX, colours[0] * SCOREY, 4 * SCOREX, SCOREY, - 24 * SCOREX, 0); /* 256-319 score */ + { + screen_tiles[x][y] = -1; + crumbled_state[x][y] = 0; + } + } } - -/* draw current values for time, gems and score counter */ - -void game_blitscore(void) +static int getMaxCenterDistancePlayerNr(int center_x, int center_y) { - 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, - 31 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 30 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 29 * SCOREX, 0); i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 28 * SCOREX, 0); - - if (lev.home == 0) + int max_dx = 0, max_dy = 0; + int player_nr = game_em.last_moving_player; + int i; + + for (i = 0; i < MAX_PLAYERS; i++) { - BlitBitmap(botBitmap, scoreBitmap, - 12 * SCOREX, 24 * SCOREY, 12 * SCOREX, SCOREY, - 14 * SCOREX, 0); /* relax */ + if (ply[i].alive) + { + int sx = PLAYER_SCREEN_X(i); + int sy = PLAYER_SCREEN_Y(i); - goto done; + if (game_em.last_player_direction[i] != MV_NONE && + (ABS(sx - center_x) > max_dx || + ABS(sy - center_y) > max_dy)) + { + max_dx = MAX(max_dx, ABS(sx - center_x)); + max_dy = MAX(max_dy, ABS(sy - center_y)); + + player_nr = i; + } + } } - if (ply1.alive + ply2.alive >= lev.home && lev.required == 0) - { - BlitBitmap(botBitmap, scoreBitmap, - 24 * SCOREX, colours[2] * SCOREY, 12 * SCOREX, SCOREY, - 14 * SCOREX, 0); /* find the exit */ + return player_nr; +} - goto done; - } +static void setMinimalPlayerBoundaries(int *sx1, int *sy1, int *sx2, int *sy2) +{ + boolean num_checked_players = 0; + int i; - if (ply1.alive + ply2.alive < lev.home) + for (i = 0; i < MAX_PLAYERS; i++) { - if (++colour_anim > 11) - colour_anim = 0; - - if (colour_anim < 6) + if (ply[i].alive) { - BlitBitmap(botBitmap, scoreBitmap, - 0, 24 * SCOREY, 12 * SCOREX, SCOREY, - 14 * SCOREX, 0); /* forget it */ + int sx = PLAYER_SCREEN_X(i); + int sy = PLAYER_SCREEN_Y(i); - goto done; - } + if (num_checked_players == 0) + { + *sx1 = *sx2 = sx; + *sy1 = *sy2 = sy; + } + else + { + *sx1 = MIN(*sx1, sx); + *sy1 = MIN(*sy1, sy); + *sx2 = MAX(*sx2, sx); + *sy2 = MAX(*sy2, sy); + } - BlitBitmap(botBitmap, scoreBitmap, - 18 * SCOREX, colours[0] * SCOREY, 6 * SCOREX, SCOREY, - 15 * SCOREX, 0); /* diamonds */ + num_checked_players++; + } } - - i = lev.required; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 20 * SCOREX, 0); - i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 19 * SCOREX, 0); - i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 18 * SCOREX, 0); - i /= 10; - BlitBitmap(botBitmap, scoreBitmap, - (i % 10) * SCOREX, colours[1] * SCOREY, SCOREX, SCOREY, - 17 * SCOREX, 0); - - done: } -void game_animscreen(void) +boolean checkIfAllPlayersFitToScreen(void) { - unsigned int x,y; - - xdebug("game_animscreen"); - - 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; - - if (x > lev.width * TILEX) - x = lev.width * TILEX; - if (y > lev.height * TILEY) - y = lev.height * TILEY; + int sx1 = 0, sy1 = 0, sx2 = 0, sy2 = 0; + int scr_fieldx = getScreenFieldSizeX(); + int scr_fieldy = getScreenFieldSizeY(); - if (x < SCR_FIELDX * TILEX) - x = SCR_FIELDX * TILEY; - if (y < SCR_FIELDY * TILEY) - y = SCR_FIELDY * TILEY; + setMinimalPlayerBoundaries(&sx1, &sy1, &sx2, &sy2); - screen_x = x - (SCR_FIELDX - 1) * TILEX; - screen_y = y - (SCR_FIELDY - 1) * TILEY; + return (sx2 - sx1 <= scr_fieldx * TILEX && + sy2 - sy1 <= scr_fieldy * TILEY); +} - animscreen(); - blitplayer(&ply1); - blitplayer(&ply2); - blitscreen(); +static void setScreenCenteredToAllPlayers(int *sx, int *sy) +{ + int sx1 = screen_x, sy1 = screen_y, sx2 = screen_x, sy2 = screen_y; - XFlush(display); + setMinimalPlayerBoundaries(&sx1, &sy1, &sx2, &sy2); - Random = Random * 129 + 1; + *sx = (sx1 + sx2) / 2; + *sy = (sy1 + sy2) / 2; } - -/* draw main menu background and copyright note */ - -void title_initscreen(void) +static void setMaxCenterDistanceForAllPlayers(int *max_dx, int *max_dy, + int center_x, int center_y) { - xdebug("title_initscreen"); + int sx1 = center_x, sy1 = center_y, sx2 = center_x, sy2 = center_y; - screen_x = 0; - screen_y = 0; + setMinimalPlayerBoundaries(&sx1, &sy1, &sx2, &sy2); - colour_shuffle(); - colours[1] += 8; - colour_anim = 0; + *max_dx = MAX(ABS(sx1 - center_x), ABS(sx2 - center_x)); + *max_dy = MAX(ABS(sy1 - center_y), ABS(sy2 - center_y)); +} -#if 1 +static boolean checkIfAllPlayersAreVisible(int center_x, int center_y) +{ + int max_dx, max_dy; - /* draw title screen on menu background */ + setMaxCenterDistanceForAllPlayers(&max_dx, &max_dy, center_x, center_y); - BlitBitmap(ttlBitmap, screenBitmap, ORIG_MENU_SX, ORIG_MENU_SY, - SCR_MENUX * TILEX, SCR_MENUY * TILEY, 0, 0); + return (max_dx <= SCR_FIELDX * TILEX / 2 && + max_dy <= SCR_FIELDY * TILEY / 2); +} - /* draw copyright note at footer */ +void RedrawPlayfield_EM(boolean force_redraw) +{ + boolean draw_new_player_location = FALSE; + boolean draw_new_player_location_wrap = FALSE; + boolean quick_relocation = setup.quick_switch; + int max_center_distance_player_nr = + getMaxCenterDistancePlayerNr(screen_x, screen_y); + int stepsize = TILEX / 8; + int offset_raw = game.scroll_delay_value; + int offset_x = MIN(offset_raw, (SCR_FIELDX - 2) / 2) * TILEX; + int offset_y = MIN(offset_raw, (SCR_FIELDY - 2) / 2) * TILEY; + int screen_x_old = screen_x; + int screen_y_old = screen_y; + int x, y, sx, sy; + int i; - if (botmaskBitmap) + if (game.set_centered_player) { - BlitBitmap(botBitmap, scoreBitmap, 0, colours[1] * SCOREY, - SCR_MENUX * TILEX, SCOREY, 0, 0); + boolean all_players_fit_to_screen = checkIfAllPlayersFitToScreen(); - SetClipOrigin(botBitmap, botBitmap->stored_clip_gc, - 0, 0 - colours[0] * SCOREY); + /* switching to "all players" only possible if all players fit to screen */ + if (game.centered_player_nr_next == -1 && !all_players_fit_to_screen) + { + game.centered_player_nr_next = game.centered_player_nr; + game.set_centered_player = FALSE; + } + + /* do not switch focus to non-existing (or non-active) player */ + if (game.centered_player_nr_next >= 0 && + !ply[game.centered_player_nr_next].alive) + { + game.centered_player_nr_next = game.centered_player_nr; + game.set_centered_player = FALSE; + } } - BlitBitmapMasked(botBitmap, scoreBitmap, 0, colours[0] * SCOREY, - SCR_MENUX * TILEX, SCOREY, 0, 0); + /* also allow focus switching when screen is scrolled to half tile */ + if (game.set_centered_player) + { + game.centered_player_nr = game.centered_player_nr_next; -#else + draw_new_player_location = TRUE; + draw_new_player_location_wrap = game.set_centered_player_wrap; + force_redraw = TRUE; - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, - 0, 0, SCR_MENUX * TILEX, SCR_MENUY * TILEY, 0, 0); + game.set_centered_player = FALSE; + game.set_centered_player_wrap = FALSE; + } - if (botmaskBitmap) + if (game.centered_player_nr == -1) { - XCopyArea(display, botPixmap, scorePixmap, scoreGC, - 0, colours[1] * SCOREY, SCR_MENUX * TILEX, SCOREY, 0, 0); - XSetClipMask(display, scoreGC, botmaskBitmap); - XSetClipOrigin(display, scoreGC, 0, 0 - colours[0] * SCOREY); + if (draw_new_player_location || offset_raw == 0) + { + setScreenCenteredToAllPlayers(&sx, &sy); + } + else + { + sx = PLAYER_SCREEN_X(max_center_distance_player_nr); + sy = PLAYER_SCREEN_Y(max_center_distance_player_nr); + } } - - XCopyArea(display, botPixmap, scorePixmap, scoreGC, - 0, colours[0] * SCOREY, SCR_MENUX * TILEX, SCOREY, 0, 0); - - if (botmaskBitmap) - XSetClipMask(display, scoreGC, None); - -#endif -} - - -/* draw bouncing ball on main menu footer */ - -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 1 - if (botmaskBitmap) + else { - BlitBitmap(botBitmap, scoreBitmap, - 32 * SCOREX, colours[1] * SCOREY, 2 * SCOREX, SCOREY, - 32 * SCOREX, 0); + sx = PLAYER_SCREEN_X(game.centered_player_nr); + sy = PLAYER_SCREEN_Y(game.centered_player_nr); + } - SetClipOrigin(botBitmap, botBitmap->stored_clip_gc, - 32 * SCOREX - x, 0 - y); + if (draw_new_player_location && quick_relocation) + { + screen_x = VALID_SCREEN_X(sx); + screen_y = VALID_SCREEN_Y(sy); + screen_x_old = screen_x; + screen_y_old = screen_y; } - BlitBitmapMasked(botBitmap, scoreBitmap, - x, y, 2 * SCOREX, SCOREY, 32 * SCOREX, 0); + if (draw_new_player_location && !quick_relocation) + { + unsigned int frame_delay_value_old = GetVideoFrameDelay(); + int wait_delay_value = frame_delay_value_old; + int screen_xx = VALID_SCREEN_X(sx); + int screen_yy = VALID_SCREEN_Y(sy); -#else + if (draw_new_player_location_wrap) + { + if (lev.infinite_true) + { + // when wrapping around (horizontally), keep vertical player position + screen_yy = screen_y; + } - 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); - } + // scrolling for wrapping should be faster than for switching players + wait_delay_value /= 4; + } - XCopyArea(display, botPixmap, scorePixmap, scoreGC, - x, y, 2 * SCOREX, SCOREY, 32 * SCOREX, 0); + SetVideoFrameDelay(wait_delay_value); - if (botmaskBitmap) - XSetClipMask(display, scoreGC, None); -#endif -} + while (screen_x != screen_xx || screen_y != screen_yy) + { + int dx = (screen_xx < screen_x ? +1 : screen_xx > screen_x ? -1 : 0); + int dy = (screen_yy < screen_y ? +1 : screen_yy > screen_y ? -1 : 0); + int dxx = 0, dyy = 0; -void title_blitants(unsigned int y) -{ - static const char ants_dashes[2] = { 8, 7 }; + if (dx == 0 && dy == 0) /* no scrolling needed at all */ + break; - xdebug("title_blitants"); + if (ABS(screen_xx - screen_x) >= TILEX) + { + screen_x -= dx * TILEX; + dxx = dx * TILEX / 2; + } + else + { + screen_x = screen_xx; + dxx = 0; + } - XSetDashes(display, antsGC, colour_anim, ants_dashes, 2); - XDrawRectangle(display, screenPixmap, antsGC, - 0, y * TILEY, SCR_MENUX * TILEX - 1, TILEY - 1); -} + if (ABS(screen_yy - screen_y) >= TILEY) + { + screen_y -= dy * TILEY; + dyy = dy * TILEY / 2; + } + else + { + screen_y = screen_yy; + dyy = 0; + } -void title_animscreen(void) -{ - blitscreen(); - XFlush(display); + /* scroll in two steps of half tile size to make things smoother */ + screen_x += dxx; + screen_y += dyy; - Random = Random * 129 + 1; -} + animscreen(); -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 */ -}; + for (i = 0; i < MAX_PLAYERS; i++) + blitplayer(i); -void title_string(unsigned int y, unsigned int left, unsigned int right, - char *string) -{ - int i; - unsigned int x; + BlitScreenToBitmap_EM(backbuffer); + BackToFront_EM(); - xdebug("title_string"); + /* scroll second step to align at full tile size */ + screen_x -= dxx; + screen_y -= dyy; - y *= TILEY; - left *= SCOREX; - right *= SCOREX; + animscreen(); - x = (left + right - strlen(string) * MENUFONTX) / 2; - if (x < left || x >= right) - x = left; + for (i = 0; i < MAX_PLAYERS; i++) + blitplayer(i); - /* restore background graphic where text will be drawn */ - BlitBitmap(ttlBitmap, screenBitmap, ORIG_MENU_SX + left, ORIG_MENU_SY + y, - right - left, MENUFONTY, left, y); + BlitScreenToBitmap_EM(backbuffer); + BackToFront_EM(); + } + + SetVideoFrameDelay(frame_delay_value_old); -#if 1 -#else - if (ttlmaskBitmap) - XSetClipMask(display, screenGC, ttlmaskBitmap); -#endif + screen_x_old = screen_x; + screen_y_old = screen_y; + } - for (i = 0; string[i] && x < right; i++) + if (force_redraw) { - int ch_pos, ch_x, ch_y; + for (y = 0; y < MAX_BUF_YSIZE; y++) + { + for (x = 0; x < MAX_BUF_XSIZE; x++) + { + screen_tiles[x][y] = -1; + crumbled_state[x][y] = 0; + } + } + } - ch_pos = ttl_map[string[i] & 127]; + /* calculate new screen scrolling position, with regard to scroll delay */ + screen_x = VALID_SCREEN_X(sx + offset_x < screen_x ? sx + offset_x : + sx - offset_x > screen_x ? sx - offset_x : + screen_x); + screen_y = VALID_SCREEN_Y(sy + offset_y < screen_y ? sy + offset_y : + sy - offset_y > screen_y ? sy - offset_y : + screen_y); - if (ch_pos == -1 || ch_pos > 22 * 2) - continue; /* no graphic for this character */ + /* prevent scrolling further than double player step size when scrolling */ + if (ABS(screen_x - screen_x_old) > 2 * stepsize) + { + int dx = SIGN(screen_x - screen_x_old); - ch_x = (ch_pos % 22) * GFXMENUFONTX; - ch_y = (ch_pos / 22 + 12) * TILEY; + screen_x = screen_x_old + dx * 2 * stepsize; + } + if (ABS(screen_y - screen_y_old) > 2 * stepsize) + { + int dy = SIGN(screen_y - screen_y_old); -#if 1 - SetClipOrigin(ttlBitmap, ttlBitmap->stored_clip_gc, - x - ORIG_MENU_SX - ch_x, y - ORIG_MENU_SY - ch_y); + screen_y = screen_y_old + dy * 2 * stepsize; + } - BlitBitmapMasked(ttlBitmap, screenBitmap, ch_x, ch_y, MENUFONTX, MENUFONTY, - x - ORIG_MENU_SX, y - ORIG_MENU_SY); -#else - if (ttlmaskBitmap) - XSetClipOrigin(display, screenGC, x - ch_x, y - ch_y); + /* prevent scrolling away from the other players when focus on all players */ + if (game.centered_player_nr == -1) + { + /* check if all players are still visible with new scrolling position */ + if (checkIfAllPlayersAreVisible(screen_x_old, screen_y_old) && + !checkIfAllPlayersAreVisible(screen_x, screen_y)) + { + /* reset horizontal scroll position to last value, if needed */ + if (!checkIfAllPlayersAreVisible(screen_x, screen_y_old)) + screen_x = screen_x_old; - XCopyArea(display, ttlPixmap, screenPixmap, screenGC, - ch_x, ch_y, MENUFONTX, MENUFONTY, x, y); -#endif + /* reset vertical scroll position to last value, if needed */ + if (!checkIfAllPlayersAreVisible(screen_x_old, screen_y)) + screen_y = screen_y_old; + } + } - x += MENUFONTX; + /* prevent scrolling (for screen correcting) if no player is moving */ + if (!game_em.any_player_moving) + { + screen_x = screen_x_old; + screen_y = screen_y_old; + } + else + { + /* prevent scrolling against the players move direction */ + int player_nr = (game.centered_player_nr == -1 ? + max_center_distance_player_nr : game.centered_player_nr); + int player_move_dir = game_em.last_player_direction[player_nr]; + int dx = SIGN(screen_x - screen_x_old); + int dy = SIGN(screen_y - screen_y_old); + + if ((dx < 0 && player_move_dir != MV_LEFT) || + (dx > 0 && player_move_dir != MV_RIGHT)) + screen_x = screen_x_old; + + if ((dy < 0 && player_move_dir != MV_UP) || + (dy > 0 && player_move_dir != MV_DOWN)) + screen_y = screen_y_old; } -#if 1 -#else - XSetClipMask(display, screenGC, None); -#endif -} + // skip redrawing playfield in warp mode or when testing tapes with "autotest" + if (DrawingDeactivatedField()) + return; -#endif + animscreen(); + + for (i = 0; i < MAX_PLAYERS; i++) + blitplayer(i); +}