[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.295,1.296

Eugene Sandulenko sev at users.sourceforge.net
Thu Jan 27 04:33:49 CET 2005


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

Modified Files:
	scumm.cpp 
Log Message:
Fix regression with 640x480 HE games so it will not let them scale above 1x.
Though I _don't_ like this fix. It looks like a dirty hack to me. There
is something completely wrong with our logics here.


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -d -r1.295 -r1.296
--- scumm.cpp	26 Jan 2005 14:14:51 -0000	1.295
+++ scumm.cpp	27 Jan 2005 12:23:36 -0000	1.296
@@ -897,6 +897,12 @@
 	_hexdumpScripts = false;
 	_showStack = false;
 
+	// FIXME: a dirty hack. Currently this is checked before engine
+	//  creation.
+	if (_heversion >= 71) {
+		_features |= GF_DEFAULT_TO_1X_SCALER;
+	}
+
 	if (_features & GF_FMTOWNS && _version == 3) {	// FM-TOWNS V3 games use 320x240
 		_screenWidth = 320;
 		_screenHeight = 240;
@@ -1000,6 +1006,13 @@
 	_system->beginGFXTransaction();
 		initCommonGFX(detector);
 		_system->initSize(_screenWidth, _screenHeight);
+
+		// FIXME: All this seems a dirty hack to me. We already
+		// have this check in constructor
+		if (_heversion >= 71) {
+			_features |= GF_DEFAULT_TO_1X_SCALER;
+			_system->setGraphicsMode("1x");
+		}
 	_system->endGFXTransaction();
 
 	int cd_num = ConfMan.getInt("cdrom");





More information about the Scummvm-git-logs mailing list