- Removed the 'features' field from GameSettings

- Removed GF_DEFAULT_TO_1X_SCALER

svn-id: r20747

3 files changed, 3 insertions, 11 deletions

diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 8d2b7e2d78..400ccce600 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -275,7 +275,7 @@ void listTargets() {
 GameSettings GameDetector::findGame(const String &gameName, const Plugin **plugin) {
 	// Find the GameSettings for this target
 	const PluginList &plugins = PluginManager::instance().getPlugins();
-	GameSettings result = {NULL, NULL, 0};
+	GameSettings result = {NULL, NULL};
 
 	PluginList::const_iterator iter = plugins.begin();
 	for (iter = plugins.begin(); iter != plugins.end(); ++iter) {
diff --git a/base/gameDetector.h b/base/gameDetector.h
index 0d7ceb2b33..bdbb68bf90 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -34,17 +34,9 @@ namespace Audio {
 	class Mixer;
 }
 
-/** Global (shared) game feature flags. */
-enum {
-//	GF_HAS_SPEECH = 1 << 28,
-//	GF_HAS_SUBTITLES = 1 << 29,
-	GF_DEFAULT_TO_1X_SCALER = 1 << 30
-};
-
 struct GameSettings {
 	const char *gameid;
 	const char *description;	// TODO: Rename this to "title" or so
-	uint32 features;			// TODO: Probably should get rid of this field
 };
 
 /**
@@ -58,7 +50,7 @@ struct GameSettings {
  */
 template <class T>
 GameSettings toGameSettings(const T &g) {
-	GameSettings dummy = { g.gameid, g.description, g.features };
+	GameSettings dummy = { g.gameid, g.description };
 	return dummy;
 }
 
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 4da156f339..4a9201c79e 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -74,7 +74,7 @@ GameSettings Plugin::findGame(const char *gameName) const {
 	// Find the GameSettings for this game
 	assert(gameName);
 	GameList games = getSupportedGames();
-	GameSettings result = {NULL, NULL, 0};
+	GameSettings result = {NULL, NULL};
 	for (GameList::iterator g = games.begin(); g != games.end(); ++g) {
 		if (!scumm_stricmp(g->gameid, gameName)) {
 			result = *g;