diff options
| author | Max Horn | 2006-02-16 23:24:23 +0000 |
|---|---|---|
| committer | Max Horn | 2006-02-16 23:24:23 +0000 |
| commit | 405733e044e5ccb454d0b022a8b6eabaa757824d (patch) | |
| tree | 9abac03604d79152e8a3ca182788daacaa24c3e8 | |
| parent | c26af987c20955e6b2a3d97f9cc4e6aa6cb36bdd (diff) | |
| download | scummvm-rg350-405733e044e5ccb454d0b022a8b6eabaa757824d.tar.gz scummvm-rg350-405733e044e5ccb454d0b022a8b6eabaa757824d.tar.bz2 scummvm-rg350-405733e044e5ccb454d0b022a8b6eabaa757824d.zip | |
- Fixed a bug that prevented you from overriding the scaler from the command
line for 640x480 games.
- Updated NEWS file a bit
svn-id: r20736
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | base/engine.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 6 | ||||
| -rw-r--r-- | engines/simon/simon.cpp | 3 |
4 files changed, 11 insertions, 8 deletions
@@ -9,7 +9,10 @@ For a more comprehensive changelog for the latest experimental CVS code, see: - ... 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: - ... diff --git a/base/engine.cpp b/base/engine.cpp index 380c20e1dd..c92caacdc2 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -62,9 +62,12 @@ Engine::~Engine() { 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)) { diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 337261ee45..4d290108bc 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1804,16 +1804,14 @@ int ScummEngine::init(GameDetector &detector) { // 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. diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 90f6e219c2..3ff65572c1 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -540,6 +540,7 @@ int SimonEngine::init(GameDetector &detector) { 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 @@ int SimonEngine::init(GameDetector &detector) { _system->beginGFXTransaction(); initCommonGFX(detector); _system->initSize(_screenWidth, _screenHeight); - if (getGameType() == GType_FF) - _system->setGraphicsMode("1x"); _system->endGFXTransaction(); // Setup midi driver |