X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=0e8945d5883b1e69d4d5b49faa72a29c6f432906;hp=72bbc14abe3df5abee36b2aeac94943cdfd3ff7b;hb=3e3b2e2cbfb978e4a18276ddfe872eed61dc1d95;hpb=bdc4b9689a59b103dac615c5b52b7641e8aaa416

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 72bbc14a..0e8945d5 100644
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -2178,10 +2178,28 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height)
   return zoom_dst;
 }
 
+static void SetOpaqueBitmapSurface(Bitmap *bitmap)
+{
+  if (bitmap == NULL)
+    return;
+
+  if (bitmap->surface)
+    SDL_FreeSurface(bitmap->surface);
+
+  if ((bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked)) == NULL)
+    Error(ERR_EXIT, "SDL_DisplayFormat() failed");
+
+  /* remove alpha channel from native non-transparent surface, if defined */
+  SDLSetAlpha(bitmap->surface, FALSE, 0);
+
+  /* remove transparent color from native non-transparent surface, if defined */
+  SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
+}
+
 Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
 {
   Bitmap *dst_bitmap = CreateBitmapStruct();
-  SDL_Surface **dst_surface = &dst_bitmap->surface;
+  SDL_Surface **dst_surface = &dst_bitmap->surface_masked;
 
   dst_width  = MAX(1, dst_width);	/* prevent zero bitmap width */
   dst_height = MAX(1, dst_height);	/* prevent zero bitmap height */
@@ -2190,11 +2208,19 @@ Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
   dst_bitmap->height = dst_height;
 
   /* create zoomed temporary surface from source surface */
-  *dst_surface = zoomSurface(src_bitmap->surface, dst_width, dst_height);
+  *dst_surface = zoomSurface(src_bitmap->surface_masked, dst_width, dst_height);
 
   /* create native format destination surface from zoomed temporary surface */
   SDLSetNativeSurface(dst_surface);
 
+  /* set color key for zoomed surface from source surface, if defined */
+  if (SDLHasColorKey(src_bitmap->surface_masked))
+    SDL_SetColorKey(*dst_surface, SET_TRANSPARENT_PIXEL,
+		    SDLGetColorKey(src_bitmap->surface_masked));
+
+  /* create native non-transparent surface for opaque blitting */
+  SetOpaqueBitmapSurface(dst_bitmap);
+
   return dst_bitmap;
 }
 
@@ -2232,15 +2258,23 @@ Bitmap *SDLLoadImage(char *filename)
     return NULL;
   }
 
+  /* remove alpha channel from native non-transparent surface, if defined */
+  SDLSetAlpha(new_bitmap->surface, FALSE, 0);
+
+  /* remove transparent color from native non-transparent surface, if defined */
+  SDL_SetColorKey(new_bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
+
   print_timestamp_time("SDL_DisplayFormat (opaque)");
 
   UPDATE_BUSY_STATE();
 
-  /* create native transparent surface for current image */
-  if (sdl_image_tmp->format->Amask == 0)
+  /* set black pixel to transparent if no alpha channel / transparent color */
+  if (!SDLHasAlpha(sdl_image_tmp) &&
+      !SDLHasColorKey(sdl_image_tmp))
     SDL_SetColorKey(sdl_image_tmp, SET_TRANSPARENT_PIXEL,
 		    SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
 
+  /* create native transparent surface for current image */
   if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
   {
     SetError("SDL_DisplayFormat(): %s", SDL_GetError());