[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.353,1.354

Eugene Sandulenko sev at users.sourceforge.net
Thu Mar 10 08:29:33 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25303/scumm

Modified Files:
	scumm.cpp 
Log Message:
Add --force-1x-overlay command line option as discussed in bugreport
#1160454 "ALL: Failed assertion when using 1x scaler"


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -d -r1.353 -r1.354
--- scumm.cpp	10 Mar 2005 00:46:26 -0000	1.353
+++ scumm.cpp	10 Mar 2005 16:29:08 -0000	1.354
@@ -1166,7 +1166,7 @@
 			_features |= GF_DEFAULT_TO_1X_SCALER;
 			_system->setGraphicsMode("1x");
 		} else {
-			_system->initSize(_screenWidth, _screenHeight, 2);
+			_system->initSize(_screenWidth, _screenHeight, (detector._force1xOverlay ? 1 : 2));
 			if (_features & GF_DEFAULT_TO_1X_SCALER)
 				_system->setGraphicsMode("1x");
 		}





More information about the Scummvm-git-logs mailing list