[Scummvm-cvs-logs] scummvm master -> a441069a4983f3a2b3c6402f1c8697003415fa55

[dhewg]

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:
93fdcbfa05 ENGINES: We have resetGraphicsScale(), lets use it
a441069a49 OPENGL: Reset the scale on mode changes


Commit: 93fdcbfa05f6cd19137d43b6e6828abacb6137dd
    https://github.com/scummvm/scummvm/commit/93fdcbfa05f6cd19137d43b6e6828abacb6137dd
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-25T11:49:48-08:00

Commit Message:
ENGINES: We have resetGraphicsScale(), lets use it

If highres games pass defaultTo1XScaler=true to initGraphics(),
use resetGraphicsScale() instead of hardcoding "1x" (which doesn't
exist on the OpenGL backend)
If an OpenGL mode is selected, it now doesn't switch back to plain
SDL now for those games.

Changed paths:
    engines/engine.cpp



diff --git a/engines/engine.cpp b/engines/engine.cpp
index 0d92c1a..825b75b 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -155,10 +155,7 @@ void initCommonGFX(bool defaultTo1XScaler) {
 
 	// See if the game should default to 1x scaler
 	if (useDefaultGraphicsMode && defaultTo1XScaler) {
-		// FIXME: As a hack, we use "1x" here. Would be nicer to use
-		// getDefaultGraphicsMode() instead, but right now, we do not specify
-		// whether that is a 1x scaler or not...
-		g_system->setGraphicsMode("1x");
+		g_system->resetGraphicsScale();
 	} else {
 		// Override global scaler with any game-specific define
 		if (ConfMan.hasKey("gfx_mode")) {


Commit: a441069a4983f3a2b3c6402f1c8697003415fa55
    https://github.com/scummvm/scummvm/commit/a441069a4983f3a2b3c6402f1c8697003415fa55
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-25T11:49:48-08:00

Commit Message:
OPENGL: Reset the scale on mode changes

Resets defaultTo1XScaler when going back to the launcher

Changed paths:
    backends/graphics/opengl/opengl-graphics.cpp



diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index f8e1937..8299745 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -136,6 +136,8 @@ int OpenGLGraphicsManager::getDefaultGraphicsMode() const {
 bool OpenGLGraphicsManager::setGraphicsMode(int mode) {
 	assert(_transactionMode == kTransactionActive);
 
+	setScale(2);
+
 	if (_oldVideoMode.setup && _oldVideoMode.mode == mode)
 		return true;