aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2013-01-08 21:21:34 -0800
committerJohannes Schickel2013-01-08 21:21:34 -0800
commit0d934df9fc4449821b0bf8c8174b40136de20659 (patch)
treeab8b1e2e9133177beb315c24e0b35b262188e5bb /engines
parentbee175ae5088f42a9eca61c3c1755de2dbfb8c3c (diff)
parentf235ef143cbd42c4883ccb28deb920be3439eeb2 (diff)
downloadscummvm-rg350-0d934df9fc4449821b0bf8c8174b40136de20659.tar.gz
scummvm-rg350-0d934df9fc4449821b0bf8c8174b40136de20659.tar.bz2
scummvm-rg350-0d934df9fc4449821b0bf8c8174b40136de20659.zip
Merge pull request #297 from clone2727/gl-default-scale-fix
ENGINES: Honor the default to 1x flag for OpenGL modes
Diffstat (limited to 'engines')
-rw-r--r--engines/engine.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 2ef4ecab60..c84404cc68 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -179,7 +179,12 @@ void initCommonGFX(bool defaultTo1XScaler) {
} else {
// Override global scaler with any game-specific define
if (ConfMan.hasKey("gfx_mode")) {
- g_system->setGraphicsMode(ConfMan.get("gfx_mode").c_str());
+ Common::String gfxMode = ConfMan.get("gfx_mode");
+ g_system->setGraphicsMode(gfxMode.c_str());
+
+ // HACK: For OpenGL modes, we will still honor the graphics scale override
+ if (defaultTo1XScaler && (gfxMode.equalsIgnoreCase("gl1") || gfxMode.equalsIgnoreCase("gl2") || gfxMode.equalsIgnoreCase("gl4")))
+ g_system->resetGraphicsScale();
}
}