[Scummvm-cvs-logs] SF.net SVN: scummvm: [20736] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 20736
Author:   fingolfin
Date:     2006-02-16 15:24:23 -0800 (Thu, 16 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20736&view=rev

Log Message:
-----------
- Fixed a bug that prevented you from overriding the scaler from the command
  line for 640x480 games.
- Updated NEWS file a bit

Modified Paths:
--------------
    scummvm/trunk/NEWS
    scummvm/trunk/base/engine.cpp
    scummvm/trunk/engines/scumm/scumm.cpp
    scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS	2006-02-16 22:49:26 UTC (rev 20735)
+++ scummvm/trunk/NEWS	2006-02-16 23:24:23 UTC (rev 20736)
@@ -9,7 +9,10 @@
    - ...
 
  General:
-   - ...
+   - Switched from CVS to Subversion.
+   - Restructured our source tree partially.
+   - Fixed a bug that prevented you from overriding the scaler from the command
+     line for 640x480 games.
 
  SCUMM:
    - ...

Modified: scummvm/trunk/base/engine.cpp
===================================================================
--- scummvm/trunk/base/engine.cpp	2006-02-16 22:49:26 UTC (rev 20735)
+++ scummvm/trunk/base/engine.cpp	2006-02-16 23:24:23 UTC (rev 20736)
@@ -62,9 +62,12 @@
 
 void Engine::initCommonGFX(GameDetector &detector) {
 	const bool useDefaultGraphicsMode =
+		!ConfMan.hasKey("gfx_mode", Common::ConfigManager::kTransientDomain) &&
+		(
 		!ConfMan.hasKey("gfx_mode", detector._targetName) ||
 		!scumm_stricmp(ConfMan.get("gfx_mode", detector._targetName).c_str(), "normal") ||
-		!scumm_stricmp(ConfMan.get("gfx_mode", detector._targetName).c_str(), "default");
+		!scumm_stricmp(ConfMan.get("gfx_mode", detector._targetName).c_str(), "default")
+		);
 
 	// See if the game should default to 1x scaler
 	if (useDefaultGraphicsMode && (detector._game.features & GF_DEFAULT_TO_1X_SCALER)) {

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-02-16 22:49:26 UTC (rev 20735)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-02-16 23:24:23 UTC (rev 20736)
@@ -1804,16 +1804,14 @@
 
 	// Initialize backend
 	_system->beginGFXTransaction();
-		initCommonGFX(detector);
 		if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 			_system->initSize(Common::kHercW, Common::kHercH, 1);
 			_features |= GF_DEFAULT_TO_1X_SCALER;
-			_system->setGraphicsMode("1x");
+			detector._game.features |= GF_DEFAULT_TO_1X_SCALER;
 		} else {
 			_system->initSize(_screenWidth, _screenHeight, (detector._force1xOverlay ? 1 : 2));
-			if (_features & GF_DEFAULT_TO_1X_SCALER)
-				_system->setGraphicsMode("1x");
 		}
+		initCommonGFX(detector);
 	_system->endGFXTransaction();
 
 	// On some systems it's not safe to run CD audio games from the CD.

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-02-16 22:49:26 UTC (rev 20735)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-02-16 23:24:23 UTC (rev 20736)
@@ -540,6 +540,7 @@
 	if (getGameType() == GType_FF) {
 		_screenWidth = 640;
 		_screenHeight = 480;
+		detector._game.features |= GF_DEFAULT_TO_1X_SCALER;
 	} else {
 		_screenWidth = 320;
 		_screenHeight = 200;
@@ -555,8 +556,6 @@
 	_system->beginGFXTransaction();
 		initCommonGFX(detector);
 		_system->initSize(_screenWidth, _screenHeight);
-		if (getGameType() == GType_FF)
-			_system->setGraphicsMode("1x");
 	_system->endGFXTransaction();
 
 	// Setup midi driver