X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_bd%2Fbd_graphics.c;h=4687ebfbe7e7d9f5aaedf26c25a25f080e67c80c;hb=2e9241bfb5323455f99c46cade55fc225b5ce9ea;hp=aab4330160292ff3727b75f758cd0a99efda7313;hpb=edaa850fd2d2cae7ec31961fae3d56487e710c71;p=rocksndiamonds.git

diff --git a/src/game_bd/bd_graphics.c b/src/game_bd/bd_graphics.c
index aab43301..4687ebfb 100644
--- a/src/game_bd/bd_graphics.c
+++ b/src/game_bd/bd_graphics.c
@@ -108,7 +108,7 @@ void set_play_area(int w, int h)
   play_area_h = h;
 }
 
-void gd_init_keystate(void)
+void gd_init_play_area(void)
 {
   set_play_area(SXSIZE, SYSIZE);
 }
@@ -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;
 }
@@ -538,11 +549,13 @@ static inline boolean el_diggable(const int element)
   return (gd_elements[element & O_MASK].properties & P_DIGGABLE) != 0;
 }
 
+#if 0
 // returns true if the element is collectible
 static inline boolean el_collectible(const int element)
 {
   return (gd_elements[element & O_MASK].properties & P_COLLECTIBLE) != 0;
 }
+#endif
 
 // returns true if the element is pushable
 static inline boolean el_pushable(const int element)
@@ -562,6 +575,12 @@ static inline boolean el_falling(const int element)
   return (gd_elements[element & O_MASK].properties & P_FALLING) != 0;
 }
 
+// returns true if the element is growing
+static inline boolean el_growing(const int element)
+{
+  return (gd_elements[element & O_MASK].properties & P_GROWING) != 0;
+}
+
 // returns true if the element is exploding
 static inline boolean el_explosion(const int element)
 {
@@ -586,14 +605,41 @@ static void gd_drawcave_tile(Bitmap *dest, GdGame *game, int x, int y, boolean d
   boolean is_moving = (is_movable_or_diggable && dir != GD_MV_STILL);
   boolean use_smooth_movements = use_bd_smooth_movements();
 
-  // do not use smooth movement animation for exploding game elements (like player)
-  if (el_explosion(tile) && dir != GD_MV_STILL)
+  // do not use smooth movement animation for growing or exploding game elements
+  if ((el_growing(tile) || el_explosion(tile)) && dir != GD_MV_STILL)
+  {
+    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 = cave->getx(cave, x + dx, y + dy);
+    int old_y = cave->gety(cave, x + dx, y + dy);
+    int last_tile_from = game->last_element_buffer[old_y][old_x] & ~SKIPPED;
+    boolean old_is_player = el_player(last_tile_from);
+
+    // check special case of player running into enemy from top or left side
+    if (old_is_player)
+    {
+      game->element_buffer[y][x] = (dir == GD_MV_LEFT  ? O_PLAYER_LEFT  :
+                                    dir == GD_MV_RIGHT ? O_PLAYER_RIGHT :
+                                    dir == GD_MV_UP    ? O_PLAYER_UP    :
+                                    dir == GD_MV_DOWN  ? O_PLAYER_DOWN  : O_PLAYER);
+
+      // draw player running into explosion (else player would disappear immediately)
+      gd_drawcave_tile(dest, game, x, y, draw_masked);
+
+      game->element_buffer[y][x] = tile;
+    }
+
     use_smooth_movements = FALSE;
+  }
 
   // do not use smooth movement animation for player entering exit (engine stopped)
   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)
   {
@@ -652,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)