fixed bug with scaled down background bitmaps

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 4ebf19bb15cc49e9e0a5f6a37937202d4ddc58dc..373e01b3e5d28e04ee94d0cdde9b6ad6207578a6 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1153,13 +1153,18 @@ void SetBackgroundImage(int graphic, int redraw_mask)
   if (graphic == IMG_UNDEFINED)
     g = &g_undefined;
 
+  // always use original size bitmap for backgrounds, if existing
+  Bitmap *bitmap = (g->bitmaps != NULL &&
+                   g->bitmaps[IMG_BITMAP_PTR_ORIGINAL] != NULL ?
+                   g->bitmaps[IMG_BITMAP_PTR_ORIGINAL] : g->bitmap);
+
   // remove every mask before setting mask for window, and
   // remove window area mask before setting mask for main or door area
   int remove_mask = (redraw_mask == REDRAW_ALL ? 0xffff : REDRAW_ALL);
 
   // (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!)
   SetBackgroundBitmap(NULL, remove_mask, 0, 0, 0, 0);  // !!! FIX THIS !!!
-  SetBackgroundBitmap(g->bitmap, redraw_mask,
+  SetBackgroundBitmap(bitmap, redraw_mask,
                      g->src_x, g->src_y,
                      g->width, g->height);
 }
@@ -3011,6 +3016,9 @@ void ShowEnvelope_MM(int envelope_nr)
   ShowEnvelope(envelope_nr);
 
   SetDrawtoField(DRAW_TO_BACKBUFFER);
+
+  BlitBitmap(bitmap_db_field, backbuffer, REAL_SX, REAL_SY,
+            FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
 }
 
 static void PrepareEnvelopeRequestToScreen(Bitmap *bitmap, int sx, int sy,