[Scummvm-cvs-logs] scummvm master -> 0d934df9fc4449821b0bf8c8174b40136de20659

[lordhoto]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f235ef143c ENGINES: Honor the default to 1x flag for OpenGL modes
0d934df9fc Merge pull request #297 from clone2727/gl-default-scale-fix


Commit: f235ef143cbd42c4883ccb28deb920be3439eeb2
    https://github.com/scummvm/scummvm/commit/f235ef143cbd42c4883ccb28deb920be3439eeb2
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2013-01-08T07:32:08-08:00

Commit Message:
ENGINES: Honor the default to 1x flag for OpenGL modes

Changed paths:
    engines/engine.cpp



diff --git a/engines/engine.cpp b/engines/engine.cpp
index 2ef4eca..c84404c 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();
 		}
 	}
 


Commit: 0d934df9fc4449821b0bf8c8174b40136de20659
    https://github.com/scummvm/scummvm/commit/0d934df9fc4449821b0bf8c8174b40136de20659
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2013-01-08T21:21:34-08:00

Commit Message:
Merge pull request #297 from clone2727/gl-default-scale-fix

ENGINES: Honor the default to 1x flag for OpenGL modes

Changed paths:
    engines/engine.cpp