X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=1e479577eb106c0ddddc36bc4a20f790da2b273a;hb=d9e1c98384aa3db472f17e8f335192ef6ef7f7b8;hp=893f765351bf8c45a9a58e0cf3ddde11d61de68e;hpb=d9a0dd2cddf1bbb6f400ec5e9f07169d813c57a6;p=rocksndiamonds.git diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 893f7653..1e479577 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -1044,11 +1044,8 @@ void SDLFadeRectangle(int x, int y, int width, int height, 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); @@ -1161,11 +1158,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); -#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;) { @@ -1228,12 +1222,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 */ -#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)