From 81798556dbd38fb829557cbe6a04132cc5edf75c Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 18 Feb 2006 00:12:36 +0000
Subject: - Removed the 'features' field from GameSettings - Removed
 GF_DEFAULT_TO_1X_SCALER

svn-id: r20747
---
 engines/sword2/sword2.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines/sword2')

diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index b4d7838b93..bcc1e36e86 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -57,9 +57,9 @@ struct Sword2GameSettings {
 
 static const Sword2GameSettings sword2_settings[] = {
 	/* Broken Sword 2 */
-	{"sword2", "Broken Sword 2: The Smoking Mirror", GF_DEFAULT_TO_1X_SCALER, "players.clu" },
-	{"sword2alt", "Broken Sword 2: The Smoking Mirror (alt)", GF_DEFAULT_TO_1X_SCALER, "r2ctlns.ocx" },
-	{"sword2demo", "Broken Sword 2: The Smoking Mirror (Demo)", GF_DEFAULT_TO_1X_SCALER | Sword2::GF_DEMO, "players.clu" },
+	{"sword2", "Broken Sword 2: The Smoking Mirror", 0, "players.clu" },
+	{"sword2alt", "Broken Sword 2: The Smoking Mirror (alt)", 0, "r2ctlns.ocx" },
+	{"sword2demo", "Broken Sword 2: The Smoking Mirror (Demo)", Sword2::GF_DEMO, "players.clu" },
 	{NULL, NULL, 0, NULL}
 };
 
@@ -115,7 +115,11 @@ Sword2Engine::Sword2Engine(GameDetector *detector, OSystem *syst) : Engine(syst)
 	Common::File::addDefaultDirectory(_gameDataPath + "sword2/");
 	Common::File::addDefaultDirectory(_gameDataPath + "video/");
 
-	_features = detector->_game.features;
+	if (0 == strcmp(detector->_game.gameid, "sword2demo"))
+		_features = GF_DEMO;
+	else
+		_features = 0;
+	
 	_targetName = detector->_targetName;
 
 	_bootParam = ConfMan.getInt("boot_param");
-- 
cgit v1.2.3