fixed graphical bug when snap-pushing with smooth movement in BD engine

[rocksndiamonds.git] / src / game_bd / bd_graphics.c

diff --git a/src/game_bd/bd_graphics.c b/src/game_bd/bd_graphics.c
index aa091ba131b44404613d50aebcdde97ce18ee4d6..4687ebfbe7e7d9f5aaedf26c25a25f080e67c80c 100644 (file)
--- a/src/game_bd/bd_graphics.c
+++ b/src/game_bd/bd_graphics.c
@@ -363,6 +363,11 @@ static boolean surface_has_c64_colors(SDL_Surface *surface)
   return has_c64_colors;
 }
 
+boolean gd_bitmap_has_c64_colors(Bitmap *bitmap)
+{
+  return surface_has_c64_colors(bitmap->surface);
+}
+
 // sets one of the colors in the indexed palette of an sdl surface to a GdColor.
 static void set_surface_palette_color(SDL_Surface *surface, int index, GdColor col)
 {
@@ -466,8 +471,14 @@ static Bitmap *get_tile_bitmap_c64(GdCave *cave, SDL_Surface *surface)
   set_surface_palette_color(surface, 7, 0);
   set_surface_palette_color(surface, 8, 0);
 
+  // set background color to be transparent for masked tile bitmap
+  int bg_color = gd_color_get_rgb(cave->color0);
+  int bg_r = gd_color_get_r(bg_color);
+  int bg_g = gd_color_get_g(bg_color);
+  int bg_b = gd_color_get_b(bg_color);
+
   // create bitmap from C64 surface
-  tile_bitmap_c64 = SDLGetBitmapFromSurface(surface);
+  tile_bitmap_c64 = SDLGetBitmapFromSurface_WithMaskedColor(surface, bg_r, bg_g, bg_b);
 
   return tile_bitmap_c64;
 }
@@ -625,6 +636,10 @@ static void gd_drawcave_tile(Bitmap *dest, GdGame *game, int x, int y, boolean d
   if (cave->player_state == GD_PL_EXITED)
     use_smooth_movements = FALSE;
 
+  // do not use smooth movement animation for player stirring the pot
+  if (tile == O_PLAYER_STIRRING)
+    use_smooth_movements = FALSE;
+
 #if DO_GFX_SANITY_CHECK
   if (use_native_bd_graphics_engine() && !setup.small_game_graphics && !program.headless)
   {
@@ -683,6 +698,11 @@ static void gd_drawcave_tile(Bitmap *dest, GdGame *game, int x, int y, boolean d
                            old_x <= cave->x2 &&
                            old_y >= cave->y1 &&
                            old_y <= cave->y2);
+
+  // never treat empty space as "moving" (may happen if player is snap-pushing element)
+  if (tile_from == O_SPACE)
+    old_is_moving = FALSE;
+
   if (old_is_visible)
   {
     if (!old_is_moving && !old_is_player)