projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup code for zooming bitmaps and creating corresponding masked bitmaps
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index 7dc231a864ce04186dfe8dc023e5a6d9b936fa83..0e7169f4d79c4eb4a339f2c22a63dc920684813c 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-977,13
+977,6
@@
void ReloadCustomImage(Bitmap *bitmap, char *basename)
free(new_bitmap);
}
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)
static void SetMaskedBitmapSurface(Bitmap *bitmap)
{
if (bitmap == NULL)
@@
-1003,6
+996,15
@@
static void SetMaskedBitmapSurface(Bitmap *bitmap)
SDL_SetColorKey(surface, UNSET_TRANSPARENT_PIXEL, 0);
}
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])
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;
bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new;
bitmaps[IMG_BITMAP_GAME] = bitmap_new;
-
- SetMaskedBitmapSurface(bitmap_new);
}
static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
}
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;
}
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");
UPDATE_BUSY_STATE();
print_timestamp_done("CreateScaledBitmaps");