}
#endif
+/* returns true if the element is a player */
+static inline boolean is_player(const int element)
+{
+ return (gd_elements[element & O_MASK].properties & P_PLAYER) != 0;
+}
+
+/* returns true if the element is collectible */
+static inline boolean is_collectible(const int element)
+{
+ return (gd_elements[element & O_MASK].properties & P_COLLECTIBLE) != 0;
+}
+
int gd_drawcave(Bitmap *dest, GdGame *game, boolean force_redraw)
{
+ GdCave *cave = game->cave;
void (*blit_bitmap)(Bitmap *, Bitmap *, int, int, int, int, int, int) = BlitBitmap;
static int show_flash_count = 0;
boolean show_flash = FALSE;
boolean redraw_all = force_redraw;
int scroll_y_aligned = scroll_y;
- int x, y, xd, yd;
+ int x, y;
/* force redraw if maximum number of cycles has changed (to redraw moving elements) */
if (game->itermax != game->itermax_last)
redraw_all = TRUE;
- if (!game->cave->gate_open_flash)
+ if (!cave->gate_open_flash)
{
show_flash_count = 0;
}
/* here we draw all cells to be redrawn. we do not take scrolling area into
consideration - sdl will do the clipping. */
- for (y = game->cave->y1, yd = 0; y <= game->cave->y2; y++, yd++)
+ for (y = cave->y1; y <= cave->y2; y++)
{
- for (x = game->cave->x1, xd = 0; x <= game->cave->x2; x++, xd++)
+ for (x = cave->x1; x <= cave->x2; x++)
{
/* potential movement direction of game element */
int dir = game->dir_buffer[y][x];
if (game->element_buffer[y][x] & SKIPPED)
continue;
- /* if it needs to be redrawn */
- SDL_Rect offset;
-
- /* sdl_blitsurface destroys offset, so we have to set y here, too.
- (ie. in every iteration) */
- offset.y = y * cell_size - scroll_y_aligned;
- offset.x = x * cell_size - scroll_x;
-
/* now we have drawn it */
game->gfx_buffer[y][x] = game->gfx_buffer[y][x] & ~GD_REDRAW;
+ int sx = x * cell_size - scroll_x;
+ int sy = y * cell_size - scroll_y_aligned;
int tile = game->element_buffer[y][x];
int frame = game->animcycle;
struct GraphicInfo_BD *g = &graphic_info_bd_object[tile][frame];
- int width = g->width * TILESIZE_VAR / TILESIZE;
- int height = g->height * TILESIZE_VAR / TILESIZE;
boolean use_smooth_movements = TRUE;
/* if game element is just moving, draw movement animation between two tiles */
if (!(game->last_element_buffer[y][x] & SKIPPED))
{
/* redraw previous game element on the cave field the new element is moving to */
- int tile_old = game->last_element_buffer[y][x] & ~SKIPPED;
- struct GraphicInfo_BD *g_old = &graphic_info_bd_object[tile_old][frame];
+ int tile_last = game->last_element_buffer[y][x];
+
+ /* only redraw previous game element if it is not collectible (like dirt etc.) */
+ if (is_collectible(tile_last))
+ tile_last = O_SPACE;
- blit_bitmap(g_old->bitmap, dest, g_old->src_x, g_old->src_y, width, height,
- offset.x, offset.y);
+ struct GraphicInfo_BD *g_old = &graphic_info_bd_object[tile_last][frame];
+
+ blit_bitmap(g_old->bitmap, dest, g_old->src_x, g_old->src_y, cell_size, cell_size,
+ sx, sy);
}
/* get cave field position the game element is moving from */
int dx = (dir == GD_MV_LEFT ? +1 : dir == GD_MV_RIGHT ? -1 : 0);
int dy = (dir == GD_MV_UP ? +1 : dir == GD_MV_DOWN ? -1 : 0);
- int old_x = game->cave->getx(game->cave, x + dx, y + dy);
- int old_y = game->cave->gety(game->cave, x + dx, y + dy);
-
- if (old_x >= game->cave->x1 &&
- old_x <= game->cave->x2 &&
- old_y >= game->cave->y1 &&
- old_y <= game->cave->y2)
+ int old_x = cave->getx(cave, x + dx, y + dy);
+ int old_y = cave->gety(cave, x + dx, y + dy);
+ int tile_from = game->element_buffer[old_y][old_x];
+ struct GraphicInfo_BD *g_from = &graphic_info_bd_object[tile_from][frame];
+ boolean old_is_player = is_player(tile_from);
+ boolean old_is_moving = (game->dir_buffer[old_y][old_x] != GD_MV_STILL);
+ boolean old_is_visible = (old_x >= cave->x1 &&
+ old_x <= cave->x2 &&
+ old_y >= cave->y1 &&
+ old_y <= cave->y2);
+
+ if (old_is_visible)
{
- if (game->dir_buffer[old_y][old_x] == GD_MV_STILL)
+ if (!old_is_moving && !old_is_player)
{
/* redraw game element on the cave field the element is moving from */
- int tile_from = game->element_buffer[old_y][old_x];
- struct GraphicInfo_BD *g_from = &graphic_info_bd_object[tile_from][0];
-
- blit_bitmap(g_from->bitmap, dest, g_from->src_x, g_from->src_y, width, height,
- offset.x + dx * cell_size, offset.y + dy * cell_size);
+ blit_bitmap(g_from->bitmap, dest, g_from->src_x, g_from->src_y, cell_size, cell_size,
+ sx + dx * cell_size, sy + dy * cell_size);
game->element_buffer[old_y][old_x] |= SKIPPED;
}
else
{
- /* if old tile also moving (like pushing player), do not redraw it again */
+ /* if old tile also moving (like pushing player), do not redraw tile background */
game->last_element_buffer[old_y][old_x] |= SKIPPED;
}
}
int itercycle = MIN(MAX(0, game->itermax - game->itercycle - 1), game->itermax);
int shift = cell_size * itercycle / game->itermax;
- offset.x += dx * shift;
- offset.y += dy * shift;
- }
+ blit_bitmap(g->bitmap, dest, g->src_x, g->src_y, cell_size, cell_size,
+ sx + dx * shift, sy + dy * shift);
- blit_bitmap(g->bitmap, dest, g->src_x, g->src_y, width, height, offset.x, offset.y);
+ /* special case: redraw player snapping a game element */
+ if (old_is_visible && old_is_player && !old_is_moving)
+ {
+ /* redraw game element on the cave field the element is moving from */
+ blit_bitmap(g_from->bitmap, dest, g_from->src_x, g_from->src_y, cell_size, cell_size,
+ sx + dx * cell_size, sy + dy * cell_size);
+ }
+ }
+ else
+ {
+ blit_bitmap(g->bitmap, dest, g->src_x, g->src_y, cell_size, cell_size, sx, sy);
+ }
#if DO_GFX_SANITY_CHECK
if (use_native_bd_graphics_engine() && !setup.small_game_graphics && !program.headless)
projects / rocksndiamonds.git / blobdiff