projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5208004
)
cleanup of function for creating opaque surface from masked surface
author
Holger Schemel
<info@artsoft.org>
Wed, 29 Jun 2016 18:48:37 +0000
(20:48 +0200)
committer
Holger Schemel
<info@artsoft.org>
Wed, 29 Jun 2016 18:48:37 +0000
(20:48 +0200)
src/libgame/sdl.c
patch
|
blob
|
history
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 60b40b3a29568bdebf76b1fb6ea592803031432c..abb200fb97d5bb04366b835f42e43cc797b63a04 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-2180,22
+2180,23
@@
SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height)
return zoom_dst;
}
return zoom_dst;
}
-static
void SetOpaqueBitmapSurface(Bitmap *bitmap
)
+static
SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface
)
{
{
- if (bitmap == NULL)
- return;
+ SDL_Surface *new_surface;
- if (
bitmap->surface
)
-
SDL_FreeSurface(bitmap->surface)
;
+ if (
surface == NULL
)
+
return NULL
;
- if ((
bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked
)) == NULL)
+ if ((
new_surface = SDLGetNativeSurface(surface
)) == NULL)
Error(ERR_EXIT, "SDL_DisplayFormat() failed");
/* remove alpha channel from native non-transparent surface, if defined */
Error(ERR_EXIT, "SDL_DisplayFormat() failed");
/* remove alpha channel from native non-transparent surface, if defined */
- SDLSetAlpha(
bitmap->
surface, FALSE, 0);
+ SDLSetAlpha(
new_
surface, FALSE, 0);
/* remove transparent color from native non-transparent surface, if defined */
/* remove transparent color from native non-transparent surface, if defined */
- SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
+ SDL_SetColorKey(new_surface, UNSET_TRANSPARENT_PIXEL, 0);
+
+ return new_surface;
}
Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
}
Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
@@
-2221,7
+2222,7
@@
Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
SDLGetColorKey(src_bitmap->surface_masked));
/* create native non-transparent surface for opaque blitting */
SDLGetColorKey(src_bitmap->surface_masked));
/* create native non-transparent surface for opaque blitting */
-
SetOpaqueBitmapSurface(dst_bitmap
);
+
dst_bitmap->surface = SDLGetOpaqueSurface(dst_bitmap->surface_masked
);
return dst_bitmap;
}
return dst_bitmap;
}