[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.559,1.560

Gregory Montoir cyx at users.sourceforge.net
Wed Aug 31 13:27:46 CEST 2005


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

Modified Files:
	scumm.cpp 
Log Message:
get rid of the GF_DEFAULT_TO_1X_SCALER hack for _heversion >= 71

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -d -r1.559 -r1.560
--- scumm.cpp	30 Aug 2005 12:29:36 -0000	1.559
+++ scumm.cpp	31 Aug 2005 20:26:44 -0000	1.560
@@ -1222,12 +1222,6 @@
 	_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 (_platform == Common::kPlatformFMTowns && _version == 3) {	// FM-TOWNS V3 games use 320x240
 		_screenWidth = 320;
 		_screenHeight = 240;
@@ -1464,13 +1458,6 @@
 			if (_features & GF_DEFAULT_TO_1X_SCALER)
 				_system->setGraphicsMode("1x");
 		}
-
-		// 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->endGFXTransaction();
 
 	// On some systems it's not safe to run CD audio games from the CD.
@@ -2953,11 +2940,15 @@
 		if (g->name) {
 			game = *g;
 			game.name = name;
-
 			if (game.description)
 				g_system->setWindowCaption(game.description);
 		}
 	}
+	// Starting from version 7.1, HE games use 640x480. We check this here since multiple
+	// versions _could_ use different resolutions (I haven't verified this, though).
+	if (game.heversion >= 71) {
+		game.features |= GF_DEFAULT_TO_1X_SCALER;
+	}
 
 	// TODO: REMOVE DEPRECATED OPTION
 	// (Perhaps GUI should display a messagebox on encountering an unknown key?)
@@ -2973,12 +2964,6 @@
 		game.midi = MDT_TOWNS;
 	}
 
-	// Special cases for HE games
-	// Games starting freddi use 640x480
-	if (game.heversion >= 71) {
-		game.features |= GF_DEFAULT_TO_1X_SCALER;
-	}
-
 	switch (game.version) {
 	case 1:
 	case 2:





More information about the Scummvm-git-logs mailing list