From 01fc7034b535e2dcc0526d5ac4d1ae4eae60459f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 18 Feb 2006 12:50:48 +0000
Subject: - Merged GameDetector::detectGame() into GameDetector::detectMain() -
 Replaced GameSettings GameDetector::_game by a simple gameid string

svn-id: r20753
---
 base/gameDetector.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'base/gameDetector.h')

diff --git a/base/gameDetector.h b/base/gameDetector.h
index bdbb68bf90..0cada3e597 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -65,14 +65,13 @@ public:
 	bool detectMain();
 
 	String _targetName;
-	GameSettings _game;	// TODO: Eventually get rid of this?!
-	const Plugin *_plugin;
+	String _gameid;
 
 	bool _dumpScripts;
 
 	bool _force1xOverlay;
 
-	void setTarget(const String &name);
+	const Plugin *_plugin;	// TODO: This should be protected
 
 public:
 	Engine *createEngine(OSystem *system);
@@ -81,8 +80,8 @@ public:
 
 	static GameSettings findGame(const String &gameName, const Plugin **plugin = NULL);
 
-protected:
-	bool detectGame(void);
+//protected:
+	void setTarget(const String &name);	// TODO: This should be protected
 };
 
 #endif
-- 
cgit v1.2.3