X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=15b706602d52de900a8774e15eca2c2b9312eba4;hb=1b285de069191476ea03c37904dc7184d73548f4;hp=1ba8c511eed1263cfbfad8da728d3c2b898a985b;hpb=b5e34de2d22082ce3c719d7502d998cfc6f2306d;p=rocksndiamonds.git diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 1ba8c511..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,9 +39,13 @@ int frame; /* current screen frame */ int screen_x, screen_y; /* current scroll position */ /* tiles currently on screen */ -static int screentiles[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]; + int getFieldbufferOffsetX_EM(void) { return screen_x % TILEX; @@ -102,18 +111,18 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) } } -void BackToFront_EM(void) +static void BackToFront_EM(void) { BlitBitmap(backbuffer, window, SX, SY, SXSIZE, SYSIZE, SX, SY); } static struct GraphicInfo_EM *getObjectGraphic(int x, int y) { - int tile = Draw[x][y]; + 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; } @@ -300,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[x][y]][frame], - Draw[x][y], 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++) { @@ -311,7 +321,7 @@ static void animscreen(void) { int sx = x % MAX_BUF_XSIZE; int sy = y % MAX_BUF_YSIZE; - int tile = Draw[x][y]; + int tile = lev.draw[x][y]; struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; int obj = g->unique_identifier; int crm = 0; @@ -326,18 +336,18 @@ 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[xx][yy]; + tile_next = lev.draw[xx][yy]; if (!graphic_info_em_object[tile_next][frame].has_crumbled_graphics) crm |= (1 << i); } } - redraw_screen_tile = (screentiles[sx][sy] != 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 */ @@ -346,7 +356,7 @@ static void animscreen(void) DrawLevelField_EM(x, y, sx, sy, FALSE); DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE); - screentiles[sx][sy] = obj; + screen_tiles[sx][sy] = obj; crumbled_state[sx][sy] = crm; } } @@ -416,8 +426,8 @@ static void blitplayer(struct PLAYER *ply) } /* redraw screen tiles in the next frame (player may have left the tiles) */ - screentiles[old_sx][old_sy] = -1; - screentiles[new_sx][new_sy] = -1; + screen_tiles[old_sx][old_sy] = -1; + screen_tiles[new_sx][new_sy] = -1; } } @@ -437,7 +447,7 @@ void game_initscreen(void) { for (x = 0; x < MAX_BUF_XSIZE; x++) { - screentiles[x][y] = -1; + screen_tiles[x][y] = -1; crumbled_state[x][y] = 0; } } @@ -545,6 +555,7 @@ 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); @@ -583,9 +594,11 @@ 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) @@ -616,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); @@ -664,8 +682,6 @@ void RedrawPlayfield_EM(boolean force_redraw) BlitScreenToBitmap_EM(backbuffer); BackToFront_EM(); - Delay(wait_delay_value); - /* scroll second step to align at full tile size */ screen_x -= dxx; screen_y -= dyy; @@ -677,10 +693,10 @@ void RedrawPlayfield_EM(boolean force_redraw) BlitScreenToBitmap_EM(backbuffer); BackToFront_EM(); - - Delay(wait_delay_value); } + SetVideoFrameDelay(frame_delay_value_old); + screen_x_old = screen_x; screen_y_old = screen_y; } @@ -691,7 +707,7 @@ void RedrawPlayfield_EM(boolean force_redraw) { for (x = 0; x < MAX_BUF_XSIZE; x++) { - screentiles[x][y] = -1; + screen_tiles[x][y] = -1; crumbled_state[x][y] = 0; } }