X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_em%2Fgraphics.c;h=5764e9e3390ba056584cc75fb41f0c4301c6e27d;hp=331491cfb25c7c0209bbae411d2d54e7a009645a;hb=359536f46007d1b9148bed9c529056faa91b8aab;hpb=f772f882546ab982dc61074f298d6115c9909f32 diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 331491cf..5764e9e3 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -3,9 +3,7 @@ * graphics manipulation crap */ -#include "global.h" -#include "display.h" -#include "level.h" +#include "main_em.h" #define MIN_SCREEN_XPOS 1 #define MIN_SCREEN_YPOS 1 @@ -29,22 +27,31 @@ (8 - frame) * ply[p].y) * TILEY / 8 \ - ((SCR_FIELDY - 1) * TILEY) / 2) +#define USE_EXTENDED_GRAPHICS_ENGINE 1 -int frame; /* current screen frame */ -int screen_x; /* current scroll position */ -int screen_y; +int frame; /* current screen frame */ +int screen_x, screen_y; /* current scroll position */ /* tiles currently on screen */ +#if 1 +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]; +#else static int screentiles[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; static int crumbled_state[MAX_BUF_YSIZE][MAX_BUF_XSIZE]; static boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE]; +#endif +#if 0 #if 1 int centered_player_nr; #else static int centered_player_nr; #endif +#endif /* copy the entire screen to the window at the scroll position */ @@ -93,14 +100,25 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) } } -void blitscreen(void) +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; +#if 1 + boolean scrolling = (screen_x != screen_x_last || screen_y != screen_y_last); +#else boolean scrolling = (screen_x % TILEX != 0 || screen_y % TILEY != 0); +#endif int x, y; +#if 0 + printf("::: %d, %d\n", screen_x, screen_y); +#endif + + SyncDisplay(); + if (redraw_tiles > REDRAWTILES_THRESHOLD || scrolling || scrolling_last) { /* blit all (up to four) parts of the scroll buffer to the backbuffer */ @@ -111,6 +129,50 @@ void blitscreen(void) } else { +#if 1 +#if 1 + boolean half_shifted_x = (screen_x % TILEX != 0); + boolean half_shifted_y = (screen_y % TILEY != 0); +#else + boolean half_shifted_x = (EVEN(SCR_FIELDX) && screen_x % TILEX != 0); + boolean half_shifted_y = (EVEN(SCR_FIELDY) && screen_y % TILEY != 0); +#endif + +#if 0 +#if 1 + printf("::: %d, %d\n", EVEN(SCR_FIELDX), screen_x); +#else + half_shifted_x = TRUE; + half_shifted_y = FALSE; +#endif +#endif + + 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); + +#else + for (x = 0; x < SCR_FIELDX; x++) { for (y = 0; y < SCR_FIELDY; y++) @@ -124,21 +186,51 @@ void blitscreen(void) SX + x * TILEX, SY + y * TILEY); } } +#endif } + 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; } -static void DrawLevelField_EM(int x, int y, int sx, int sy, - boolean draw_masked) +void blitscreen(void) +{ + BackToFront_EM(); +} + +static struct GraphicInfo_EM *getObjectGraphic(int x, int y) { int tile = Draw[y][x]; 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); + + return g; +} + +static struct GraphicInfo_EM *getPlayerGraphic(int player_nr, int anim) +{ + struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame]; + + if (!game.use_native_emc_graphics_engine) + getGraphicSourcePlayerExt_EM(g, player_nr, anim, 7 - frame); + + return g; +} + +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; int src_y = g->src_y + g->src_offset_y; int dst_x = sx * TILEX + g->dst_offset_x; @@ -177,8 +269,11 @@ static void DrawLevelField_EM(int x, int y, int sx, int sy, static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, int crm, boolean draw_masked) { - int tile = Draw[y][x]; - struct GraphicInfo_EM *g = &graphic_info_em_object[tile][frame]; +#if 1 + struct GraphicInfo_EM *g; +#else + struct GraphicInfo_EM *g = getObjectGraphic(x, y); +#endif int left = screen_x / TILEX; int top = screen_y / TILEY; int i; @@ -191,6 +286,17 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, if (crm == 0) /* no crumbled edges for this tile */ return; +#if 1 + g = getObjectGraphic(x, y); +#endif + +#if 0 + if (x == 3 && y == 3 && frame == 0) + printf("::: %d, %d\n", + graphic_info_em_object[207][0].crumbled_src_x, + graphic_info_em_object[207][0].crumbled_src_y); +#endif + for (i = 0; i < 4; i++) { if (crm & (1 << i)) @@ -237,8 +343,7 @@ static void DrawLevelFieldCrumbled_EM(int x, int y, int sx, int sy, static void DrawLevelPlayer_EM(int x1, int y1, int player_nr, int anim, boolean draw_masked) { - struct GraphicInfo_EM *g = &graphic_info_em_player[player_nr][anim][frame]; - + struct GraphicInfo_EM *g = getPlayerGraphic(player_nr, anim); int src_x = g->src_x, src_y = g->src_y; int dst_x, dst_y; @@ -316,6 +421,12 @@ static void animscreen(void) { 0, +1 } }; + 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 = top; y < top + MAX_BUF_YSIZE; y++) { for (x = left; x < left + MAX_BUF_XSIZE; x++) @@ -326,6 +437,7 @@ static void animscreen(void) 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) @@ -347,8 +459,17 @@ static void animscreen(void) } } + redraw_screen_tile = (screentiles[sy][sx] != obj || + crumbled_state[sy][sx] != crm); + +#if 0 + /* !!! TEST ONLY -- CHANGE THIS !!! */ + if (!game.use_native_emc_graphics_engine) + redraw_screen_tile = TRUE; +#endif + /* only redraw screen tiles if they (or their crumbled state) changed */ - if (screentiles[sy][sx] != obj || crumbled_state[sy][sx] != crm) + if (redraw_screen_tile) { DrawLevelField_EM(x, y, sx, sy, FALSE); DrawLevelFieldCrumbled_EM(x, y, sx, sy, crm, FALSE); @@ -382,6 +503,10 @@ static void blitplayer(struct PLAYER *ply) x2 = x1 + TILEX - 1; y2 = y1 + TILEY - 1; +#if 0 + printf("::: %d, %d\n", x1, y1); +#endif + if ((int)(x2 - screen_x) < ((MAX_BUF_XSIZE - 1) * TILEX - 1) && (int)(y2 - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1)) { @@ -443,9 +568,14 @@ static void blitplayer(struct PLAYER *ply) DrawLevelField_EM(new_x, new_y, new_sx, new_sy, TRUE); } - /* mark screen tiles as dirty */ + /* 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; } } @@ -458,9 +588,11 @@ void game_initscreen(void) frame = 6; - centered_player_nr = getCenteredPlayerNr_EM(); +#if 0 + game.centered_player_nr = getCenteredPlayerNr_EM(); +#endif - player_nr = (centered_player_nr != -1 ? centered_player_nr : 0); + player_nr = (game.centered_player_nr != -1 ? game.centered_player_nr : 0); screen_x = VALID_SCREEN_X(PLAYER_SCREEN_X(player_nr)); screen_y = VALID_SCREEN_Y(PLAYER_SCREEN_Y(player_nr)); @@ -490,7 +622,7 @@ void DrawRelocatePlayer(struct PlayerInfo *player, boolean quick_relocation) if (quick_relocation) { - int offset = (setup.scroll_delay ? 3 : 0); + int offset = game.scroll_delay_value; if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) { @@ -574,6 +706,34 @@ void DrawRelocatePlayer(struct PlayerInfo *player, boolean quick_relocation) } #endif +static int getMaxCenterDistancePlayerNr(int center_x, int center_y) +{ + int max_dx = 0, max_dy = 0; + int player_nr = game_em.last_moving_player; + int i; + + for (i = 0; i < MAX_PLAYERS; i++) + { + if (ply[i].alive) + { + int sx = PLAYER_SCREEN_X(i); + int sy = PLAYER_SCREEN_Y(i); + + 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; + } + } + } + + return player_nr; +} + static void setMinimalPlayerBoundaries(int *sx1, int *sy1, int *sx2, int *sy2) { boolean num_checked_players = 0; @@ -655,9 +815,18 @@ void RedrawPlayfield_EM(boolean force_redraw) #if 0 boolean scrolling = (screen_x % TILEX != 0 || screen_y % TILEY != 0); #endif - boolean set_centered_player = getSetCenteredPlayer_EM(); - int centered_player_nr_next = getCenteredPlayerNr_EM(); - int offset = (setup.scroll_delay ? 3 : 0) * TILEX; +#if 0 + boolean game.set_centered_player = getSetCenteredPlayer_EM(); + int game.centered_player_nr_next = getCenteredPlayerNr_EM(); +#endif +#if 1 + int max_center_distance_player_nr = + getMaxCenterDistancePlayerNr(screen_x, screen_y); +#else + int player_nr = game_em.last_moving_player; +#endif + int stepsize = TILEX / 8; + int offset = game.scroll_delay_value * TILEX; int offset_x = offset; int offset_y = offset; int screen_x_old = screen_x; @@ -665,28 +834,23 @@ void RedrawPlayfield_EM(boolean force_redraw) int x, y, sx, sy; int i; - if (set_centered_player) + if (game.set_centered_player) { boolean all_players_fit_to_screen = checkIfAllPlayersFitToScreen(); /* switching to "all players" only possible if all players fit to screen */ - if (centered_player_nr_next == -1 && !all_players_fit_to_screen) + if (game.centered_player_nr_next == -1 && !all_players_fit_to_screen) { - centered_player_nr_next = centered_player_nr; - setCenteredPlayerNr_EM(centered_player_nr); - - set_centered_player = FALSE; - setSetCenteredPlayer_EM(FALSE); + 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 (centered_player_nr_next >= 0 && !ply[centered_player_nr_next].alive) + if (game.centered_player_nr_next >= 0 && + !ply[game.centered_player_nr_next].alive) { - centered_player_nr_next = centered_player_nr; - setCenteredPlayerNr_EM(centered_player_nr); - - set_centered_player = FALSE; - setSetCenteredPlayer_EM(FALSE); + game.centered_player_nr_next = game.centered_player_nr; + game.set_centered_player = FALSE; } } @@ -697,36 +861,45 @@ void RedrawPlayfield_EM(boolean force_redraw) #endif { #if 1 - if (set_centered_player) + if (game.set_centered_player) #else - if (centered_player_nr != centered_player_nr_next) + if (game.centered_player_nr != game.centered_player_nr_next) #endif { - centered_player_nr = centered_player_nr_next; + game.centered_player_nr = game.centered_player_nr_next; draw_new_player_location = TRUE; force_redraw = TRUE; - setSetCenteredPlayer_EM(FALSE); + game.set_centered_player = FALSE; } } - if (centered_player_nr == -1) + if (game.centered_player_nr == -1) { +#if 1 + if (draw_new_player_location || offset == 0) +#else if (draw_new_player_location) +#endif { setScreenCenteredToAllPlayers(&sx, &sy); } else { +#if 1 + sx = PLAYER_SCREEN_X(max_center_distance_player_nr); + sy = PLAYER_SCREEN_Y(max_center_distance_player_nr); +#else sx = PLAYER_SCREEN_X(game_em.last_moving_player); sy = PLAYER_SCREEN_Y(game_em.last_moving_player); +#endif } } else { - sx = PLAYER_SCREEN_X(centered_player_nr); - sy = PLAYER_SCREEN_Y(centered_player_nr); + sx = PLAYER_SCREEN_X(game.centered_player_nr); + sy = PLAYER_SCREEN_Y(game.centered_player_nr); } if (draw_new_player_location && quick_relocation) @@ -826,14 +999,16 @@ void RedrawPlayfield_EM(boolean force_redraw) blitplayer(&ply[i]); blitscreen(); - FlushDisplay(); + Delay(wait_delay_value); /* scroll second step to align at full tile size */ screen_x -= dxx; screen_y -= dyy; +#if 0 SyncDisplay(); +#endif animscreen(); @@ -841,7 +1016,7 @@ void RedrawPlayfield_EM(boolean force_redraw) blitplayer(&ply[i]); blitscreen(); - FlushDisplay(); + Delay(wait_delay_value); } @@ -869,23 +1044,68 @@ void RedrawPlayfield_EM(boolean force_redraw) sy - offset_y > screen_y ? sy - offset_y : screen_y); - /* prevent scrolling further than player step size screen when scrolling */ - if (ABS(screen_x - screen_x_old) > TILEX / 8 || - ABS(screen_y - screen_y_old) > TILEY / 8) +#if 0 + printf("::: (%d, %d) => (%d, %d) [(%d, %d), (%d, %d)] [%d, %d] [%d / %d]\n", + screen_x_old, screen_y_old, + screen_x, screen_y, + ply[max_center_distance_player_nr].oldx, + ply[max_center_distance_player_nr].x, + ply[max_center_distance_player_nr].oldy, + ply[max_center_distance_player_nr].y, + sx, sy, + ABS(screen_x - screen_x_old), + ABS(screen_y - screen_y_old)); +#endif + +#if 1 + +#if 1 + /* 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); + + 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); + + screen_y = screen_y_old + dy * 2 * stepsize; + } +#else + /* prevent scrolling further than double player step size when scrolling */ + if (ABS(screen_x - screen_x_old) > 2 * stepsize || + ABS(screen_y - screen_y_old) > 2 * stepsize) { int dx = SIGN(screen_x - screen_x_old); int dy = SIGN(screen_y - screen_y_old); - screen_x = screen_x_old + dx * TILEX / 8; - screen_y = screen_y_old + dy * TILEY / 8; + screen_x = screen_x_old + dx * 2 * stepsize; + screen_y = screen_y_old + dy * 2 * stepsize; } +#endif + +#else + /* prevent scrolling further than player step size when scrolling */ + if (ABS(screen_x - screen_x_old) > stepsize || + ABS(screen_y - screen_y_old) > stepsize) + { + int dx = SIGN(screen_x - screen_x_old); + int dy = SIGN(screen_y - screen_y_old); + + screen_x = screen_x_old + dx * stepsize; + screen_y = screen_y_old + dy * stepsize; + } +#endif /* prevent scrolling away from the other players when focus on all players */ - if (centered_player_nr == -1) + if (game.centered_player_nr == -1) { #if 1 /* check if all players are still visible with new scrolling position */ - if (!checkIfAllPlayersAreVisible(screen_x, screen_y)) + 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)) @@ -917,7 +1137,11 @@ void RedrawPlayfield_EM(boolean force_redraw) else { /* prevent scrolling against the players move direction */ +#if 0 int player_nr = game_em.last_moving_player; +#endif + 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); @@ -936,11 +1160,13 @@ void RedrawPlayfield_EM(boolean force_redraw) for (i = 0; i < MAX_PLAYERS; i++) blitplayer(&ply[i]); +#if 0 +#if 0 SyncDisplay(); +#endif blitscreen(); - - FlushDisplay(); +#endif } void game_animscreen(void) @@ -950,12 +1176,47 @@ void game_animscreen(void) void DrawGameDoorValues_EM() { +#if 1 + int dynamite_state; + int key_state; +#else int dynamite_state = ply[0].dynamite; /* !!! ONLY PLAYER 1 !!! */ - int all_keys_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys; + int key_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys; +#endif + +#if 1 + if (game.centered_player_nr == -1) + { +#if 1 + int i; + + dynamite_state = 0; + key_state = 0; + + for (i = 0; i < MAX_PLAYERS; i++) + { + dynamite_state += ply[i].dynamite; + key_state |= ply[i].keys; + } + +#else + + dynamite_state = ply[0].dynamite; /* !!! ONLY PLAYER 1 !!! */ + key_state = ply[0].keys | ply[1].keys | ply[2].keys | ply[3].keys; +#endif + } + else + { + int player_nr = game.centered_player_nr; + + dynamite_state = ply[player_nr].dynamite; + key_state = ply[player_nr].keys; + } +#endif #if 1 DrawAllGameValues(lev.required, dynamite_state, lev.score, - lev.time, all_keys_state); + lev.time, key_state); #else DrawAllGameValues(lev.required, ply1.dynamite, lev.score, DISPLAY_TIME(lev.time), ply1.keys | ply2.keys);