[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl.cpp,1.37,1.38 sdl_gl.cpp,1.42,1.43

[Torbj?rn Andersson]

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

Modified Files:
	sdl.cpp sdl_gl.cpp 
Log Message:
Allow the 3x scaler in fullscreen mode. Since we have aspect ratio
correction now it can look quite different from 1x and 2x.


Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- sdl.cpp	22 Jun 2003 14:18:33 -0000	1.37
+++ sdl.cpp	30 Jun 2003 14:31:09 -0000	1.38
@@ -119,16 +119,11 @@
 		break;
 
 	case GFX_TRIPLESIZE:
-		if (_full_screen) {
-			warning("full screen in useless in triplesize mode, reverting to normal mode");
-			goto normal_mode;
-		}
 		_scaleFactor = 3;
 		_scaler_proc = Normal3x;
 		break;
 
 	case GFX_NORMAL:
-normal_mode:;
 		_scaleFactor = 1;
 		_scaler_proc = Normal1x;
 		break;

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sdl_gl.cpp	30 Jun 2003 02:38:56 -0000	1.42
+++ sdl_gl.cpp	30 Jun 2003 14:31:09 -0000	1.43
@@ -159,16 +159,11 @@
 		break;
 
 	case GFX_TRIPLESIZE:
-		if (_full_screen) {
-			warning("full screen in useless in triplesize mode, reverting to normal mode");
-			goto normal_mode;
-		}
 		_scaleFactor = 3;
 		_scaler_proc = Normal3x;
 		break;
 
 	case GFX_NORMAL:
-normal_mode:;
 		_scaleFactor = 1; //_usingOpenGL ? 2 : 1;
 		_scaler_proc = Normal1x;
 		break;