projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed converting surfaces with alpha channel for SDL 1.2
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 893f765351bf8c45a9a58e0cf3ddde11d61de68e..72bbc14abe3df5abee36b2aeac94943cdfd3ff7b 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-340,10
+340,12
@@
SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
if (surface == NULL)
return NULL;
if (surface == NULL)
return NULL;
- if (video.initialized)
- new_surface = SDL_DisplayFormat(surface);
- else
+ if (!video.initialized)
new_surface = SDL_ConvertSurface(surface, surface->format, SURFACE_FLAGS);
new_surface = SDL_ConvertSurface(surface, surface->format, SURFACE_FLAGS);
+ else if (SDLHasAlpha(surface))
+ new_surface = SDL_DisplayFormatAlpha(surface);
+ else
+ new_surface = SDL_DisplayFormat(surface);
if (new_surface == NULL)
Error(ERR_EXIT, "%s() failed: %s",
if (new_surface == NULL)
Error(ERR_EXIT, "%s() failed: %s",
@@
-1044,11
+1046,8
@@
void SDLFadeRectangle(int x, int y, int width, int height,
int i;
SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);
int i;
SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);
-#if defined(TARGET_SDL2)
- SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_NONE);
-#else
- SDL_SetAlpha(surface_target, 0, 0); /* disable alpha blending */
-#endif
+
+ SDLSetAlpha(surface_target, FALSE, 0); /* disable alpha blending */
ypos[0] = -GetSimpleRandom(16);
ypos[0] = -GetSimpleRandom(16);
@@
-1161,11
+1160,8
@@
void SDLFadeRectangle(int x, int y, int width, int height,
int xx_size = width / 2;
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
int xx_size = width / 2;
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
-#if defined(TARGET_SDL2)
- SDL_SetSurfaceBlendMode(surface_source, SDL_BLENDMODE_NONE);
-#else
- SDL_SetAlpha(surface_source, 0, 0); /* disable alpha blending */
-#endif
+
+ SDLSetAlpha(surface_source, FALSE, 0); /* disable alpha blending */
for (xx = 0; xx < xx_size;)
{
for (xx = 0; xx < xx_size;)
{
@@
-1228,12
+1224,7
@@
void SDLFadeRectangle(int x, int y, int width, int height,
SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);
/* draw new (target) image to screen buffer using alpha blending */
SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);
/* draw new (target) image to screen buffer using alpha blending */
-#if defined(TARGET_SDL2)
- SDL_SetSurfaceAlphaMod(surface_target, alpha_final);
- SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_BLEND);
-#else
- SDL_SetAlpha(surface_target, SDL_SRCALPHA, alpha_final);
-#endif
+ SDLSetAlpha(surface_target, TRUE, alpha_final);
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
if (draw_border_function != NULL)
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
if (draw_border_function != NULL)