[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.103,1.104

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv23788

Modified Files:
	sdl.cpp 
Log Message:
hopefully this fixes the scalers on non-MacOSX systems again...

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** sdl.cpp	27 Apr 2002 11:07:32 -0000	1.103
--- sdl.cpp	27 Apr 2002 11:56:47 -0000	1.104
***************
*** 312,316 ****
  		_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)
--- 312,315 ----
***************
*** 322,329 ****
  		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);
  		if (sdl_tmpscreen == NULL)
  			error("sdl_tmpscreen failed");
--- 321,334 ----
  		if (sdl_hwscreen == NULL)
  			error("sdl_hwscreen failed");
! 		
  		/* Need some extra bytes around when using 2XSAI */
! 		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");