From 7e47e03cd17d22f9ccfd7376511350b622ea9c38 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 27 Apr 2002 11:56:47 +0000
Subject: hopefully this fixes the scalers on non-MacOSX systems again...

svn-id: r4107
---
 sdl.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'sdl.cpp')

diff --git a/sdl.cpp b/sdl.cpp
index f7435e4738..51dcdf6afc 100644
--- a/sdl.cpp
+++ b/sdl.cpp
@@ -311,7 +311,6 @@ normal_mode:;
 		uint16 *tmp_screen = (uint16*)calloc(320*204 + 16,sizeof(uint16));
 		_mode_flags = DF_FORCE_FULL_ON_PALETTE | DF_WANT_RECT_OPTIM | DF_2xSAI | DF_SEPARATE_HWSCREEN | DF_UPDATE_EXPAND_1_PIXEL;
 
-		Init_2xSaI(555);
 		sdl_screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 200, 8, 0, 0, 0, 0);
 		if (sdl_screen == NULL)
 			error("SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 200, 8, 0, 0, 0, 0) failed");
@@ -321,10 +320,16 @@ normal_mode:;
 		);
 		if (sdl_hwscreen == NULL)
 			error("sdl_hwscreen failed");
-
+		
 		/* Need some extra bytes around when using 2XSAI */
-		sdl_tmpscreen = SDL_CreateRGBSurfaceFrom(tmp_screen + TMP_SCREEN_OFFS, 320, 200, 16,
-			320*2, 0x7C00,0x3E0,0x001F,0);
+		Init_2xSaI(555);
+		sdl_tmpscreen = SDL_CreateRGBSurfaceFrom(tmp_screen + TMP_SCREEN_OFFS,
+							320, 200, 16, 320*2,
+							sdl_hwscreen->format->Rmask,
+							sdl_hwscreen->format->Gmask,
+							sdl_hwscreen->format->Bmask,
+							sdl_hwscreen->format->Amask);
+
 		if (sdl_tmpscreen == NULL)
 			error("sdl_tmpscreen failed");
 
-- 
cgit v1.2.3