[Scummvm-cvs-logs] scummvm master -> ee6853daf29357c55aa125a25cde348e1e1e70be
lordhoto
lordhoto at gmail.com
Tue Mar 1 04:58:38 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ee6853daf2 GUI: Fix default mode bug in initCommonGFX.
Commit: ee6853daf29357c55aa125a25cde348e1e1e70be
https://github.com/scummvm/scummvm/commit/ee6853daf29357c55aa125a25cde348e1e1e70be
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-28T19:57:10-08:00
Commit Message:
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).
Changed paths:
engines/engine.cpp
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 825b75b..d773f37 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") ||
More information about the Scummvm-git-logs
mailing list