diff options
| author | Matthew Hoops | 2012-12-29 15:45:11 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2013-01-08 10:32:08 -0500 |
| commit | f235ef143cbd42c4883ccb28deb920be3439eeb2 (patch) | |
| tree | d8b2ba2ebcc13652860f0a0afc42a5cab79a91d0 /engines/engine.cpp | |
| parent | 21ea60f604b586da7337e2794fb4b4f25e63701b (diff) | |
| download | scummvm-rg350-f235ef143cbd42c4883ccb28deb920be3439eeb2.tar.gz scummvm-rg350-f235ef143cbd42c4883ccb28deb920be3439eeb2.tar.bz2 scummvm-rg350-f235ef143cbd42c4883ccb28deb920be3439eeb2.zip | |
ENGINES: Honor the default to 1x flag for OpenGL modes
Diffstat (limited to 'engines/engine.cpp')
| -rw-r--r-- | engines/engine.cpp | 7 |
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(); } } |