From ee6853daf29357c55aa125a25cde348e1e1e70be Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 1 Mar 2011 04:48:33 +0100
Subject: 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).
---
 engines/engine.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/engine.cpp b/engines/engine.cpp
index 825b75bfc8..d773f370f5 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") ||
-- 
cgit v1.2.3