Reduced use of GF_DEFAULT_TO_1X_SCALER in favor of a new param to Engine::initCommonGFX; added a TODO stating that it should eventually be removed completly

svn-id: r20738

2 files changed, 3 insertions, 3 deletions

diff --git a/base/engine.cpp b/base/engine.cpp
index c92caacdc2..38e2b9e0dc 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -60,7 +60,7 @@ Engine::~Engine() {
 	g_engine = NULL;
 }
 
-void Engine::initCommonGFX(GameDetector &detector) {
+void Engine::initCommonGFX(GameDetector &detector, bool defaultTo1XScaler) {
 	const bool useDefaultGraphicsMode =
 		!ConfMan.hasKey("gfx_mode", Common::ConfigManager::kTransientDomain) &&
 		(
@@ -70,7 +70,7 @@ void Engine::initCommonGFX(GameDetector &detector) {
 		);
 
 	// See if the game should default to 1x scaler
-	if (useDefaultGraphicsMode && (detector._game.features & GF_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...
diff --git a/base/engine.h b/base/engine.h
index 6517d4bba1..da01a34eb9 100644
--- a/base/engine.h
+++ b/base/engine.h
@@ -72,7 +72,7 @@ public:
 	/** Specific for each engine: prepare error string. */
 	virtual void errorString(const char *buf_input, char *buf_output);
 
-	void initCommonGFX(GameDetector &detector);
+	void initCommonGFX(GameDetector &detector, bool defaultTo1XScaler);
 
 	/** On some systems, check if the game appears to be run from CD. */
 	void checkCD();