fix compile error caused by mixing of SDL2 and SDL1 code

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index b090c2bc17ad6e7ad3698aa1965e4a03152906a5..ea1ab82f0a0f4949cf3521463a621fa988eb6a09 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1149,8 +1149,8 @@ void Sys_SendKeyEvents( void )
                                        {
                                                SDL_FreeSurface(vid_softsurface);
                                                vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, vid.width, vid.height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
-                                               vid.softpixels = (unsigned int *)vid_softsurface->pixels;
                                                SDL_SetAlpha(vid_softsurface, 0, 255);
+                                               vid.softpixels = (unsigned int *)vid_softsurface->pixels;
                                                if (vid.softdepthpixels)
                                                        free(vid.softdepthpixels);
                                                vid.softdepthpixels = (unsigned int*)calloc(1, vid.width * vid.height * 4);
@@ -1299,6 +1299,7 @@ void Sys_SendKeyEvents( void )
                                                        {
                                                                SDL_FreeSurface(vid_softsurface);
                                                                vid_softsurface = SDL_CreateRGBSurface(SDL_SWSURFACE, vid.width, vid.height, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
+                                                               SDL_SetSurfaceBlendMode(vid_softsurface, SDL_BLENDMODE_NONE);
                                                                vid.softpixels = (unsigned int *)vid_softsurface->pixels;
                                                                if (vid.softdepthpixels)
                                                                        free(vid.softdepthpixels);
@@ -2711,6 +2712,8 @@ static qboolean VID_InitModeSoft(viddef_mode_t *mode)
        }
 #if SDL_MAJOR_VERSION == 1
        SDL_SetAlpha(vid_softsurface, 0, 255);
+#else
+       SDL_SetSurfaceBlendMode(vid_softsurface, SDL_BLENDMODE_NONE);
 #endif
 
        vid.softpixels = (unsigned int *)vid_softsurface->pixels;