From: Holger Schemel <info@artsoft.org>
Date: Wed, 29 Jun 2016 06:37:26 +0000 (+0200)
Subject: cleanup code for zooming bitmaps and creating corresponding masked bitmaps
X-Git-Tag: 4.0.0.0~58
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=f7fcf0207e03bea13618e718f522c15d9120460c

cleanup code for zooming bitmaps and creating corresponding masked bitmaps
---

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 7dc231a8..0e7169f4 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -977,13 +977,6 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
   free(new_bitmap);
 }
 
-Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
-{
-  Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
-
-  return dst_bitmap;
-}
-
 static void SetMaskedBitmapSurface(Bitmap *bitmap)
 {
   if (bitmap == NULL)
@@ -1003,6 +996,15 @@ static void SetMaskedBitmapSurface(Bitmap *bitmap)
   SDL_SetColorKey(surface, UNSET_TRANSPARENT_PIXEL, 0);
 }
 
+static Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
+{
+  Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
+
+  SetMaskedBitmapSurface(dst_bitmap);
+
+  return dst_bitmap;
+}
+
 void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
 {
   if (bitmaps[IMG_BITMAP_CUSTOM])
@@ -1027,8 +1029,6 @@ void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
 
   bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new;
   bitmaps[IMG_BITMAP_GAME]   = bitmap_new;
-
-  SetMaskedBitmapSurface(bitmap_new);
 }
 
 static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
@@ -1196,12 +1196,6 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
     bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
   }
 
-  // create corresponding bitmaps for masked blitting
-  for (i = 0; i < NUM_IMG_BITMAPS; i++)
-    if (bitmaps[i] != NULL &&
-	bitmaps[i] != old_bitmap)
-      SetMaskedBitmapSurface(bitmaps[i]);
-
   UPDATE_BUSY_STATE();
 
   print_timestamp_done("CreateScaledBitmaps");
diff --git a/src/libgame/system.h b/src/libgame/system.h
index 06bed391..fa422caf 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1462,7 +1462,6 @@ Bitmap *LoadImage(char *);
 Bitmap *LoadCustomImage(char *);
 void ReloadCustomImage(Bitmap *, char *);
 
-Bitmap *ZoomBitmap(Bitmap *, int, int);
 void ReCreateGameTileSizeBitmap(Bitmap **);
 void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
 void CreateBitmapTextures(Bitmap **);