Commiting Fingolfins patch to remove gamedetector usage.

svn-id: r21830

3 files changed, 14 insertions, 15 deletions

diff --git a/backends/symbian/src/SymbianActions.cpp b/backends/symbian/src/SymbianActions.cpp
index 29a02d19f6..42679b889f 100644
--- a/backends/symbian/src/SymbianActions.cpp
+++ b/backends/symbian/src/SymbianActions.cpp
@@ -62,8 +62,8 @@ const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU,
 #endif
 
 // creator function according to Factory Pattern
-void SymbianActions::init(GameDetector &detector) {
-	_instance = new SymbianActions(detector);
+void SymbianActions::init(const Common::String &gameid) {
+	_instance = new SymbianActions(gameid);
 }
 
 
@@ -83,8 +83,8 @@ int SymbianActions::version() {
 	return ACTION_VERSION;
 }
 
-SymbianActions::SymbianActions(GameDetector &detector) :
-	Actions(detector) {
+SymbianActions::SymbianActions(const Common::String &gameid) :
+	Actions(gameid) {
 	int i;
 
 	for (i = 0; i < ACTION_LAST; i++) {
@@ -121,17 +121,17 @@ void SymbianActions::initInstanceMain(OSystem *mainSystem) {
 }
 
 void SymbianActions::initInstanceGame() {
-	bool is_simon = (strncmp(_detector->_gameid.c_str(), "simon", 5) == 0);
-	bool is_sky = (_detector->_gameid == "sky");
-	bool is_queen = (_detector->_gameid == "queen");
-	bool is_gob = (strncmp(_detector->_gameid.c_str(), "gob", 3) == 0);
-	bool is_ite = ((strncmp(_detector->_gameid.c_str(), "ite", 3) == 0) ||
-				  (strncmp(_detector->_gameid.c_str(), "ihnm", 4) == 0));
+	bool is_simon = (strncmp(_gameid.c_str(), "simon", 5) == 0);
+	bool is_sky = (_gameid == "sky");
+	bool is_queen = (_gameid == "queen");
+	bool is_gob = (strncmp(_gameid.c_str(), "gob", 3) == 0);
+	bool is_ite = ((strncmp(_gameid.c_str(), "ite", 3) == 0) ||
+				  (strncmp(_gameid.c_str(), "ihnm", 4) == 0));
 	
 	Actions::initInstanceGame();
 
 	// See if a right click mapping could be needed
-	if (is_sky || _detector->_gameid == "samnmax" || is_gob)
+	if (is_sky || _gameid == "samnmax" || is_gob)
 		_right_click_needed = true;
 
 	// Initialize keys for different actions
diff --git a/backends/symbian/src/SymbianActions.h b/backends/symbian/src/SymbianActions.h
index 50a3ed6bac..f8e82afcb0 100644
--- a/backends/symbian/src/SymbianActions.h
+++ b/backends/symbian/src/SymbianActions.h
@@ -26,7 +26,6 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "base/gameDetector.h"
 #include "gui/Key.h"
 #include "gui/Actions.h"
 
@@ -58,7 +57,7 @@ public:
 	bool perform(ActionType action, bool pushed = true);
 	Common::String actionName(ActionType action);
 	int size();
-	static void init(GameDetector &detector);
+	static void init(const Common::String &gameid);
 	void initInstanceMain(OSystem *mainSystem);
 	void initInstanceGame();
 
@@ -69,7 +68,7 @@ public:
 	~SymbianActions();
 
 private:
-	SymbianActions(GameDetector &detector);
+	SymbianActions(const Common::String &gameid);
 	bool _right_click_needed;
 };
 
diff --git a/backends/symbian/src/SymbianOS.cpp b/backends/symbian/src/SymbianOS.cpp
index 720fb85820..d7539fcfe9 100644
--- a/backends/symbian/src/SymbianOS.cpp
+++ b/backends/symbian/src/SymbianOS.cpp
@@ -377,7 +377,7 @@ void OSystem_SDL_Symbian::setWindowCaption(const char *caption) {
 }
 
 void OSystem_SDL_Symbian::check_mappings() {
-	if (!GUI::Actions::Instance()->gameDetector()._targetName.size() || GUI::Actions::Instance()->initialized())
+	if (!GUI::Actions::Instance()->_gameid.size() || GUI::Actions::Instance()->initialized())
 		return;
 
 	GUI::Actions::Instance()->initInstanceGame();