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 /base | |
| 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
Diffstat (limited to 'base')
| -rw-r--r-- | base/engine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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)) { |