X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=c1b02110a6a0543b8b916fda368072ab8735244b;hp=12c621809b2f589440727cddabcc2e7b525643d9;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181 diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 12c62180..c1b02110 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -36,24 +36,31 @@ int screen_x, screen_y; /* current scroll position */ /* tiles currently on screen */ static int screentiles[MAX_PLAYFIELD_HEIGHT + 2][MAX_PLAYFIELD_WIDTH + 2]; static int crumbled_state[MAX_PLAYFIELD_HEIGHT + 2][MAX_PLAYFIELD_WIDTH + 2]; -static boolean redraw[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2]; -/* copy the entire screen to the window at the scroll position */ +int getFieldbufferOffsetX_EM(void) +{ + return screen_x % TILEX; +} + +int getFieldbufferOffsetY_EM(void) +{ + return screen_y % TILEY; +} 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 sx, sy, sxsize, sysize; int xsize = SXSIZE; int ysize = SYSIZE; int full_xsize = lev.width * TILEX; int full_ysize = lev.height * TILEY; - - sxsize = (full_xsize < xsize ? full_xsize : xsize); - sysize = (full_ysize < ysize ? full_ysize : ysize); - sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); - sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + 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); if (x < 2 * TILEX && y < 2 * TILEY) { @@ -97,77 +104,7 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) void BackToFront_EM(void) { - static int screen_x_last = -1, screen_y_last = -1; - static boolean scrolling_last = FALSE; - int left = screen_x / TILEX; - int top = screen_y / TILEY; - boolean scrolling = (screen_x != screen_x_last || screen_y != screen_y_last); - int x, y; - - SyncDisplay(); - - if (redraw_tiles > REDRAWTILES_THRESHOLD || scrolling || scrolling_last) - { - /* blit all (up to four) parts of the scroll buffer to the backbuffer */ - BlitScreenToBitmap_EM(backbuffer); - - /* blit the completely updated backbuffer to the window (in one blit) */ - BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY); - } - else - { - boolean half_shifted_x = (screen_x % TILEX != 0); - boolean half_shifted_y = (screen_y % TILEY != 0); - - int sx, sy; - int xsize = SXSIZE; - int ysize = SYSIZE; - int full_xsize = lev.width * TILEX; - int full_ysize = lev.height * TILEY; - - sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); - sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); - - int x1 = 0, x2 = SCR_FIELDX - (half_shifted_x ? 0 : 1); - int y1 = 0, y2 = SCR_FIELDY - (half_shifted_y ? 0 : 1); - int scroll_xoffset = (half_shifted_x ? TILEX / 2 : 0); - int scroll_yoffset = (half_shifted_y ? TILEY / 2 : 0); - - InitGfxClipRegion(TRUE, SX, SY, SXSIZE, SYSIZE); - - for (x = x1; x <= x2; x++) - { - for (y = y1; y <= y2; y++) - { - 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 - scroll_xoffset, - sy + y * TILEY - scroll_yoffset); - } - } - - InitGfxClipRegion(FALSE, -1, -1, -1, -1); - } - - FlushDisplay(); - - for (x = 0; x < MAX_BUF_XSIZE; x++) - for (y = 0; y < MAX_BUF_YSIZE; y++) - redraw[x][y] = FALSE; - redraw_tiles = 0; - - screen_x_last = screen_x; - screen_y_last = screen_y; - scrolling_last = scrolling; -} - -void blitscreen(void) -{ - BackToFront_EM(); + BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY); } static struct GraphicInfo_EM *getObjectGraphic(int x, int y) @@ -212,12 +149,8 @@ static void DrawLevelField_EM(int x, int y, int sx, int sy, 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 { @@ -249,7 +182,8 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, g = getObjectGraphic(x, y); - crumbled_border_size = g->crumbled_border_size * TILESIZE_VAR / TILESIZE; + crumbled_border_size = + g->crumbled_border_size * TILESIZE_VAR / g->crumbled_tile_size; for (i = 0; i < 4; i++) { @@ -280,12 +214,8 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, 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); @@ -314,24 +244,18 @@ static void DrawLevelPlayer_EM(int x1, int y1, int player_nr, int anim, /* 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); } @@ -424,9 +348,6 @@ static void animscreen(void) screentiles[sy][sx] = obj; crumbled_state[sy][sx] = crm; - - redraw[sx][sy] = TRUE; - redraw_tiles++; } } } @@ -497,11 +418,6 @@ static void blitplayer(struct PLAYER *ply) /* redraw screen tiles in the next frame (player may have left the tiles) */ screentiles[old_sy][old_sx] = -1; screentiles[new_sy][new_sx] = -1; - - /* mark screen tiles as dirty (force screen refresh with changed content) */ - redraw[old_sx][old_sy] = TRUE; - redraw[new_sx][new_sy] = TRUE; - redraw_tiles += 2; } } @@ -585,7 +501,7 @@ static void setMinimalPlayerBoundaries(int *sx1, int *sy1, int *sx2, int *sy2) } } -boolean checkIfAllPlayersFitToScreen() +boolean checkIfAllPlayersFitToScreen(void) { int sx1 = 0, sy1 = 0, sx2 = 0, sy2 = 0; @@ -745,7 +661,8 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); - blitscreen(); + BlitScreenToBitmap_EM(backbuffer); + BackToFront_EM(); Delay(wait_delay_value); @@ -758,7 +675,8 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); - blitscreen(); + BlitScreenToBitmap_EM(backbuffer); + BackToFront_EM(); Delay(wait_delay_value); } @@ -842,17 +760,12 @@ void RedrawPlayfield_EM(boolean force_redraw) screen_y = screen_y_old; } + // skip redrawing playfield in warp mode or when testing tapes with "autotest" + if (DrawingDeactivatedField()) + return; + animscreen(); for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); } - -void game_animscreen(void) -{ - RedrawPlayfield_EM(FALSE); -} - -void DrawGameDoorValues_EM() -{ -}