[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.70,1.71 sdl.cpp,1.41,1.42 sdl_gl.cpp,1.49,1.50

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv16609

Modified Files:
	sdl-common.cpp sdl.cpp sdl_gl.cpp 
Log Message:
Fixed mishandling of _mode_flags that prevented the Simon games from using
the DF_WANT_RECT_OPTIM flag.


Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- sdl-common.cpp	20 Jul 2003 15:31:47 -0000	1.70
+++ sdl-common.cpp	20 Jul 2003 18:53:26 -0000	1.71
@@ -59,6 +59,7 @@
 	_mode = gfx_mode;
 	_full_screen = full_screen;
 	_adjustAspectRatio = aspect_ratio;
+	_mode_flags = 0;
 
 	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK) ==-1) {
 		error("Could not initialize SDL: %s.\n", SDL_GetError());

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- sdl.cpp	5 Jul 2003 15:28:27 -0000	1.41
+++ sdl.cpp	20 Jul 2003 18:53:27 -0000	1.42
@@ -56,7 +56,7 @@
 
 void OSystem_SDL::load_gfx_mode() {
 	_forceFull = true;
-	_mode_flags = DF_UPDATE_EXPAND_1_PIXEL;
+	_mode_flags |= DF_UPDATE_EXPAND_1_PIXEL;
 
 	_tmpscreen = NULL;
 	_tmpScreenWidth = (_screenWidth + 3);

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- sdl_gl.cpp	10 Jul 2003 10:24:06 -0000	1.49
+++ sdl_gl.cpp	20 Jul 2003 18:53:27 -0000	1.50
@@ -94,7 +94,7 @@
 	Amask = 0;
 
 	_forceFull = true;
-	_mode_flags = DF_UPDATE_EXPAND_1_PIXEL;
+	_mode_flags |= DF_UPDATE_EXPAND_1_PIXEL;
 
 	_tmpscreen = NULL;
 	_tmpScreenWidth = (_screenWidth + 3);