X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=15b706602d52de900a8774e15eca2c2b9312eba4;hb=449875f76f4db3321d90bdca0b7060c2e53e8ba9;hp=12c621809b2f589440727cddabcc2e7b525643d9;hpb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 12c62180..15b70660 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -5,10 +5,15 @@ #include "main_em.h" -#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)) +#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) + +#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) @@ -34,26 +39,37 @@ int frame; /* current screen frame */ 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]; +static int screen_tiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2]; +static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2]; + +/* graphic info for game objects/frames and players/actions/frames */ +struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8]; +struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8]; -/* 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) { @@ -95,88 +111,18 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) } } -void BackToFront_EM(void) +static 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) { - int tile = Draw[y][x]; + int tile = lev.draw[x][y]; struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; if (!game.use_native_emc_graphics_engine) - getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - 2, y - 2); + getGraphicSourceObjectExt_EM(g, tile, 7 - frame, x - lev.left, y - lev.top); return g; } @@ -212,12 +158,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 +191,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 +223,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 +253,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); } @@ -376,10 +309,11 @@ static void animscreen(void) }; if (!game.use_native_emc_graphics_engine) - for (y = 2; y < EM_MAX_CAVE_HEIGHT - 2; y++) - for (x = 2; x < EM_MAX_CAVE_WIDTH - 2; x++) - SetGfxAnimation_EM(&graphic_info_em_object[Draw[y][x]][frame], - Draw[y][x], 7 - frame, x - 2, y - 2); + 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], 7 - frame, + x - lev.left, y - lev.top); for (y = top; y < top + MAX_BUF_YSIZE; y++) { @@ -387,7 +321,7 @@ static void animscreen(void) { int sx = x % MAX_BUF_XSIZE; int sy = y % MAX_BUF_YSIZE; - int tile = Draw[y][x]; + int tile = lev.draw[x][y]; struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; int obj = g->unique_identifier; int crm = 0; @@ -402,19 +336,19 @@ static void animscreen(void) int yy = y + xy[i][1]; int tile_next; - if (xx < 0 || xx >= EM_MAX_CAVE_WIDTH || - yy < 0 || yy >= EM_MAX_CAVE_HEIGHT) + if (xx < 0 || xx >= CAVE_BUFFER_WIDTH || + yy < 0 || yy >= CAVE_BUFFER_HEIGHT) continue; - tile_next = Draw[yy][xx]; + tile_next = lev.draw[xx][yy]; if (!graphic_info_em_object[tile_next][frame].has_crumbled_graphics) crm |= (1 << i); } } - redraw_screen_tile = (screentiles[sy][sx] != obj || - crumbled_state[sy][sx] != crm); + 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) @@ -422,11 +356,8 @@ static void animscreen(void) DrawLevelField_EM(x, y, sx, sy, FALSE); DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE); - screentiles[sy][sx] = obj; - crumbled_state[sy][sx] = crm; - - redraw[sx][sy] = TRUE; - redraw_tiles++; + screen_tiles[sx][sy] = obj; + crumbled_state[sx][sy] = crm; } } } @@ -465,7 +396,7 @@ static void blitplayer(struct PLAYER *ply) 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_sy][new_sx]; + 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); @@ -495,13 +426,8 @@ 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; + screen_tiles[old_sx][old_sy] = -1; + screen_tiles[new_sx][new_sy] = -1; } } @@ -521,8 +447,8 @@ void game_initscreen(void) { for (x = 0; x < MAX_BUF_XSIZE; x++) { - screentiles[y][x] = -1; - crumbled_state[y][x] = 0; + screen_tiles[x][y] = -1; + crumbled_state[x][y] = 0; } } } @@ -585,7 +511,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; @@ -629,13 +555,14 @@ static boolean checkIfAllPlayersAreVisible(int center_x, int center_y) void RedrawPlayfield_EM(boolean force_redraw) { boolean draw_new_player_location = FALSE; + boolean draw_new_player_location_fast = FALSE; boolean quick_relocation = setup.quick_switch; int max_center_distance_player_nr = getMaxCenterDistancePlayerNr(screen_x, screen_y); int stepsize = TILEX / 8; - int offset = game.scroll_delay_value * TILEX; - int offset_x = offset; - int offset_y = offset; + 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; @@ -667,14 +594,16 @@ void RedrawPlayfield_EM(boolean force_redraw) game.centered_player_nr = game.centered_player_nr_next; draw_new_player_location = TRUE; + draw_new_player_location_fast = game.set_centered_player_fast; force_redraw = TRUE; game.set_centered_player = FALSE; + game.set_centered_player_fast = FALSE; } if (game.centered_player_nr == -1) { - if (draw_new_player_location || offset == 0) + if (draw_new_player_location || offset_raw == 0) { setScreenCenteredToAllPlayers(&sx, &sy); } @@ -700,11 +629,16 @@ void RedrawPlayfield_EM(boolean force_redraw) if (draw_new_player_location && !quick_relocation) { - unsigned int game_frame_delay_value = getGameFrameDelay_EM(20); - int wait_delay_value = game_frame_delay_value; + 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); + if (draw_new_player_location_fast) + wait_delay_value /= 4; + + SetVideoFrameDelay(wait_delay_value); + while (screen_x != screen_xx || screen_y != screen_yy) { int dx = (screen_xx < screen_x ? +1 : screen_xx > screen_x ? -1 : 0); @@ -745,9 +679,8 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); - blitscreen(); - - Delay(wait_delay_value); + BlitScreenToBitmap_EM(backbuffer); + BackToFront_EM(); /* scroll second step to align at full tile size */ screen_x -= dxx; @@ -758,11 +691,12 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); - blitscreen(); - - Delay(wait_delay_value); + BlitScreenToBitmap_EM(backbuffer); + BackToFront_EM(); } + SetVideoFrameDelay(frame_delay_value_old); + screen_x_old = screen_x; screen_y_old = screen_y; } @@ -773,8 +707,8 @@ void RedrawPlayfield_EM(boolean force_redraw) { for (x = 0; x < MAX_BUF_XSIZE; x++) { - screentiles[y][x] = -1; - crumbled_state[y][x] = 0; + screen_tiles[x][y] = -1; + crumbled_state[x][y] = 0; } } } @@ -842,17 +776,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() -{ -}