X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=54711e9536026e5bff44b1e90372c6452a212506;hb=f85e877642f788205d1414ab1f7eee29679386e6;hp=05ac1a0231e197b6df1a430d0b30ba3081903d5e;hpb=fdd2829c52e8f4ec204e089b5d35ed5aef50e4e6;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 05ac1a02..54711e95 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -36,12 +36,11 @@ 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 */ 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; @@ -97,23 +96,7 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) void BackToFront_EM(void) { - int x, y; - - /* 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); - - for (x = 0; x < MAX_BUF_XSIZE; x++) - for (y = 0; y < MAX_BUF_YSIZE; y++) - redraw[x][y] = FALSE; - redraw_tiles = 0; -} - -void blitscreen(void) -{ - BackToFront_EM(); } static struct GraphicInfo_EM *getObjectGraphic(int x, int y) @@ -191,7 +174,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++) { @@ -356,9 +340,6 @@ static void animscreen(void) screentiles[sy][sx] = obj; crumbled_state[sy][sx] = crm; - - redraw[sx][sy] = TRUE; - redraw_tiles++; } } } @@ -429,11 +410,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; } } @@ -677,7 +653,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); @@ -690,7 +667,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); } @@ -779,8 +757,3 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); } - -void game_animscreen(void) -{ - RedrawPlayfield_EM(FALSE); -}