X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=8555328112113a6f88b373719b36c64fdf4ae036;hb=1afe0b4fb9e16c78f2bb810c1225098f5d77e2d3;hp=f0d73e7311e9e102686a56319b8c4ce59e4f7df9;hpb=f47abfa991814f09bfc5e388f284663bd23e2829;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index f0d73e73..85553281 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -171,8 +171,6 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize,
 
   gfx.field_save_buffer = field_save_buffer;
 
-  gfx.drawing_area_changed = FALSE;
-
   SetDrawDeactivationMask(REDRAW_NONE);		/* do not deactivate drawing */
   SetDrawBackgroundMask(REDRAW_NONE);		/* deactivate masked drawing */
 }
@@ -319,9 +317,12 @@ inline static int GetRealDepth(int depth)
 }
 
 inline static void sysFillRectangle(Bitmap *bitmap, int x, int y,
-			       int width, int height, Pixel color)
+				    int width, int height, Pixel color)
 {
   SDLFillRectangle(bitmap, x, y, width, height, color);
+
+  if (bitmap == backbuffer)
+    SetRedrawMaskFromArea(x, y, width, height);
 }
 
 inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
@@ -330,6 +331,9 @@ inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap,
 {
   SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height,
 	      dst_x, dst_y, mask_mode);
+
+  if (dst_bitmap == backbuffer)
+    SetRedrawMaskFromArea(dst_x, dst_y, width, height);
 }
 
 void LimitScreenUpdates(boolean enable)
@@ -438,6 +442,28 @@ void CloseWindow(DrawWindow *window)
 {
 }
 
+void SetRedrawMaskFromArea(int x, int y, int width, int height)
+{
+  int x1 = x;
+  int y1 = y;
+  int x2 = x + width - 1;
+  int y2 = y + height - 1;
+
+  if (width == 0 || height == 0)
+    return;
+
+  if (IN_GFX_FIELD_FULL(x1, y1) && IN_GFX_FIELD_FULL(x2, y2))
+    redraw_mask |= REDRAW_FIELD;
+  else if (IN_GFX_DOOR_1(x1, y1) && IN_GFX_DOOR_1(x2, y2))
+    redraw_mask |= REDRAW_DOOR_1;
+  else if (IN_GFX_DOOR_2(x1, y1) && IN_GFX_DOOR_2(x2, y2))
+    redraw_mask |= REDRAW_DOOR_2;
+  else if (IN_GFX_DOOR_3(x1, y1) && IN_GFX_DOOR_3(x2, y2))
+    redraw_mask |= REDRAW_DOOR_3;
+  else
+    redraw_mask = REDRAW_ALL;
+}
+
 inline static boolean CheckDrawingArea(int x, int y, int width, int height,
 				       int draw_mask)
 {
@@ -473,16 +499,6 @@ boolean DrawingOnBackground(int x, int y)
 	  CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask));
 }
 
-boolean DrawingAreaChanged()
-{
-  int drawing_area_changed = gfx.drawing_area_changed;
-
-  // reset flag for change of drawing area after querying it
-  gfx.drawing_area_changed = FALSE;
-
-  return drawing_area_changed;
-}
-
 static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y,
 				  int *width, int *height, boolean is_dest)
 {
@@ -835,7 +851,7 @@ Bitmap *LoadCustomImage(char *basename)
     Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename);
 
   if ((new_bitmap = LoadImage(filename)) == NULL)
-    Error(ERR_EXIT, "LoadImage() failed: %s", GetError());
+    Error(ERR_EXIT, "LoadImage('%s') failed: %s", basename, GetError());
 
   return new_bitmap;
 }
@@ -862,7 +878,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
 
   if ((new_bitmap = LoadImage(filename)) == NULL)
   {
-    Error(ERR_WARN, "LoadImage() failed: %s", GetError());
+    Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError());
     return;
   }