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

Max Horn fingolfin at users.sourceforge.net
Sat Oct 4 17:41:07 CEST 2003


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

Modified Files:
	sdl.cpp sdl_gl.cpp 
Log Message:
cleanup

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sdl.cpp	5 Oct 2003 00:28:23 -0000	1.53
+++ sdl.cpp	5 Oct 2003 00:40:24 -0000	1.54
@@ -62,6 +62,19 @@
 	_tmpScreenWidth = (_screenWidth + 3);
 	
 	switch(_mode) {
+	case GFX_NORMAL:
+		_scaleFactor = 1;
+		_scaler_proc = Normal1x;
+		break;
+	case GFX_DOUBLESIZE:
+		_scaleFactor = 2;
+		_scaler_proc = Normal2x;
+		break;
+	case GFX_TRIPLESIZE:
+		_scaleFactor = 3;
+		_scaler_proc = Normal3x;
+		break;
+
 	case GFX_2XSAI:
 		_scaleFactor = 2;
 		_scaler_proc = _2xSaI;
@@ -99,25 +112,8 @@
 		_scaler_proc = DotMatrix;
 		break;
 
-	case GFX_BILINEAR:
-	case GFX_DOUBLESIZE:
-		_scaleFactor = 2;
-		_scaler_proc = Normal2x;
-		break;
-
-	case GFX_TRIPLESIZE:
-		_scaleFactor = 3;
-		_scaler_proc = Normal3x;
-		break;
-
-	case GFX_NORMAL:
-		_scaleFactor = 1;
-		_scaler_proc = Normal1x;
-		break;
 	default:
 		error("unknown gfx mode %d", _mode);
-		_scaleFactor = 1;
-		_scaler_proc = NULL;
 	}
 
 	//

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- sdl_gl.cpp	5 Oct 2003 00:28:23 -0000	1.61
+++ sdl_gl.cpp	5 Oct 2003 00:40:25 -0000	1.62
@@ -103,6 +103,7 @@
 	case GFX_BILINEAR:
 		_usingOpenGL = true;
 		_mode = GFX_NORMAL;
+		// FIXME: shouldn't _scaleFactor be set here?
 		break;
 
 	case GFX_NORMAL:





More information about the Scummvm-git-logs mailing list