[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl.cpp,1.52,1.53 sdl_gl.cpp,1.60,1.61

Max Horn fingolfin at users.sourceforge.net
Sat Oct 4 17:29:06 CEST 2003


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

Modified Files:
	sdl.cpp sdl_gl.cpp 
Log Message:
fixed some broken scaler related checks

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- sdl.cpp	4 Oct 2003 11:50:20 -0000	1.52
+++ sdl.cpp	5 Oct 2003 00:28:23 -0000	1.53
@@ -387,7 +387,7 @@
 #endif
 		return 1;
 	} else if (param == PROP_SET_GFX_MODE) {
-		if (value->gfx_mode >= 11)
+		if (value->gfx_mode > 11)	// FIXME! HACK, hard coded threshold, not good
 			return 0;
 
 		_mode = value->gfx_mode;

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sdl_gl.cpp	4 Oct 2003 23:49:04 -0000	1.60
+++ sdl_gl.cpp	5 Oct 2003 00:28:23 -0000	1.61
@@ -636,7 +636,7 @@
 		}
 
 	} else if (param == PROP_SET_GFX_MODE) {
-		if (value->gfx_mode > 10) { // OpenGL modes
+		if (value->gfx_mode == GFX_BILINEAR) { // OpenGL mode
 			if (!_usingOpenGL) {
 				_usingOpenGL = true;
 				_mode = GFX_NORMAL;
@@ -652,7 +652,7 @@
 				fb2gl.setBilinearMode(_glBilinearFilter);
 				break;
 			default: // SDL backend
-				if (value->gfx_mode >= 11)
+				if (value->gfx_mode > 11)	// FIXME! HACK, hard coded threshold, not good
 					return 0;
 
 				_mode = value->gfx_mode;





More information about the Scummvm-git-logs mailing list