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/simon/simon.cpp | 36 ++++++++++++++++++------------------
 engines/simon/simon.h   |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'engines/simon')

diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index ba8bb58dcb..2ef92cb3e1 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -57,7 +57,7 @@ struct ObsoleteTargets {
 	Common::Platform platform;
 
 	GameSettings toGameSettings() const {
-		GameSettings dummy = { from, "Obsolete Target", 0 };
+		GameSettings dummy = { from, "Obsolete Target" };
 		return dummy;
 	}
 };
@@ -83,23 +83,23 @@ static ObsoleteTargets obsoleteTargetsTable[] = {
 
 static const GameSettings simonGames[] = {
 	// Simon the Sorcerer 1 & 2 (not SCUMM games)
-	{"feeble", "The Feeble Files", 0},
-	{"simon1", "Simon the Sorcerer 1", 0},
-	{"simon2", "Simon the Sorcerer 2", 0},
-
-	{"simon1acorn", "Simon the Sorcerer 1 (Acorn)", 0},
-	{"simon1amiga", "Simon the Sorcerer 1 (Amiga)", 0},
-	{"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)", 0},
-	{"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", 0},
-	{"simon1dos", "Simon the Sorcerer 1 (DOS)", 0},
-	{"simon1talkie", "Simon the Sorcerer 1 Talkie", 0},
-	{"simon1win", "Simon the Sorcerer 1 Talkie (Windows)", 0},
-	{"simon2dos", "Simon the Sorcerer 2 (DOS)", 0},
-	{"simon2talkie", "Simon the Sorcerer 2 Talkie", 0},
-	{"simon2win", "Simon the Sorcerer 2 Talkie (Windows)", 0},
-	{"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", 0},
-
-	{NULL, NULL, 0}
+	{"feeble", "The Feeble Files"},
+	{"simon1", "Simon the Sorcerer 1"},
+	{"simon2", "Simon the Sorcerer 2"},
+
+	{"simon1acorn", "Simon the Sorcerer 1 (Acorn)"},
+	{"simon1amiga", "Simon the Sorcerer 1 (Amiga)"},
+	{"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)"},
+	{"simon1demo", "Simon the Sorcerer 1 (DOS Demo)"},
+	{"simon1dos", "Simon the Sorcerer 1 (DOS)"},
+	{"simon1talkie", "Simon the Sorcerer 1 Talkie"},
+	{"simon1win", "Simon the Sorcerer 1 Talkie (Windows)"},
+	{"simon2dos", "Simon the Sorcerer 2 (DOS)"},
+	{"simon2talkie", "Simon the Sorcerer 2 Talkie"},
+	{"simon2win", "Simon the Sorcerer 2 Talkie (Windows)"},
+	{"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)"},
+
+	{NULL, NULL}
 };
 
 GameList Engine_SIMON_gameList() {
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index c2b58f03b6..1c0e2a1c84 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -128,7 +128,7 @@ struct GameDescription {
 	Common::Platform platform;
 
 	GameSettings toGameSettings() const {
-		GameSettings dummy = { name, title, features };
+		GameSettings dummy = { name, title };
 		return dummy;
 	}
 };
-- 
cgit v1.2.3