changed name of preprocessor constant to improve readability

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index b0df34409cfbc97772af22c78e8815c9ae6c3644..38f5dd7bad62e7b5e731ed006a71ad9fc2ef4af1 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1486,7 +1486,7 @@ void getGraphicSourceBitmap(int graphic, int tilesize, Bitmap **bitmap)
   if (tilesize == gfx.standard_tile_size)
     *bitmap = g->bitmaps[IMG_BITMAP_STANDARD];
   else if (tilesize == game.tile_size)
-    *bitmap = g->bitmaps[IMG_BITMAP_GAME];
+    *bitmap = g->bitmaps[IMG_BITMAP_PTR_GAME];
   else
     *bitmap = g->bitmaps[IMG_BITMAP_1x1 - log_2(tilesize_capped)];
 }
@@ -1532,7 +1532,7 @@ void getSizedGraphicSourceExt(int graphic, int frame, int tilesize,
     *g = graphic_info[IMG_CHAR_EXCLAM];
 
   // if no in-game graphics defined, always use standard graphic size
-  if (g->bitmaps[IMG_BITMAP_GAME] == NULL)
+  if (g->bitmaps[IMG_BITMAP_PTR_GAME] == NULL)
     tilesize = TILESIZE;
 
   getGraphicSourceBitmap(graphic, tilesize, bitmap);
@@ -2535,6 +2535,16 @@ void DrawScreenField(int x, int y)
     else
       DrawScreenElement(x, y, EL_EMPTY);
 
+    if (cut_mode != CUT_BELOW && game.use_masked_elements)
+    {
+      int dir = MovDir[lx][ly];
+      int newx = x + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
+      int newy = y + (dir == MV_UP   ? -1 : dir == MV_DOWN  ? +1 : 0);
+
+      if (IN_SCR_FIELD(newx, newy))
+       DrawScreenElement(newx, newy, EL_EMPTY);
+    }
+
     if (horiz_move)
       DrawScreenElementShifted(x, y, MovPos[lx][ly], 0, element, NO_CUTTING);
     else if (cut_mode == NO_CUTTING)