diff options
| author | Johannes Schickel | 2011-03-01 04:48:33 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-03-01 04:57:10 +0100 |
| commit | ee6853daf29357c55aa125a25cde348e1e1e70be (patch) | |
| tree | f0120139ff8fabd03824b3cbbe0e1fcf20917d4b | |
| parent | 06e88662d92bc60a5f04a81ac44534a1c1fa8163 (diff) | |
| download | scummvm-rg350-ee6853daf29357c55aa125a25cde348e1e1e70be.tar.gz scummvm-rg350-ee6853daf29357c55aa125a25cde348e1e1e70be.tar.bz2 scummvm-rg350-ee6853daf29357c55aa125a25cde348e1e1e70be.zip | |
GUI: Fix default mode bug in initCommonGFX.
Formerly when a game which used defaultTo1XScaler was run with "-gdefault" from
command line, it was run with a 2x scaler in case of the SDL backend, since it
defaults to 2x (see SdlGraphicsManager::getDefaultGraphicsMode).
| -rw-r--r-- | engines/engine.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp index 825b75bfc8..d773f370f5 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -145,7 +145,11 @@ void initCommonGFX(bool defaultTo1XScaler) { assert(transientDomain); const bool useDefaultGraphicsMode = - !transientDomain->contains("gfx_mode") && + (!transientDomain->contains("gfx_mode") || + !scumm_stricmp(transientDomain->getVal("gfx_mode").c_str(), "normal") || + !scumm_stricmp(transientDomain->getVal("gfx_mode").c_str(), "default") + ) + && ( !gameDomain || !gameDomain->contains("gfx_mode") || |