- Renamed ConfigManager::getActiveDomain to getActiveDomainName, and added a new getActiveDomain method that returns a pointer to the actual active *domain*

- Added Engine::_targetName whose value is computed from the name of the active domain
- Removed GameDetector::_targetName, instead code now uses either Engine::_targetName or the name of the active domain
- This in turn allowed for removing usage of GameDetector in many places

svn-id: r21916

2 files changed, 7 insertions, 8 deletions

diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 7db5e26e2e..6f11859a92 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -117,8 +117,8 @@ DetectedGameList Engine_SWORD1_detectGames(const FSList &fslist) {
 	return detectedGames;
 }
 
-Engine *Engine_SWORD1_create(GameDetector *detector, OSystem *syst) {
-	return new SwordEngine(detector, syst);
+Engine *Engine_SWORD1_create(OSystem *syst) {
+	return new SwordEngine(syst);
 }
 
 REGISTER_PLUGIN(SWORD1, "Broken Sword");
@@ -131,7 +131,7 @@ void SwordEngine::errorString(const char *buf1, char *buf2) {
 	strcpy(buf2, buf1);
 }
 
-SwordEngine::SwordEngine(GameDetector *detector, OSystem *syst)
+SwordEngine::SwordEngine(OSystem *syst)
 	: Engine(syst) {
 
 	if (0 == scumm_stricmp(ConfMan.get("gameid").c_str(), "sword1demo"))
@@ -166,10 +166,10 @@ SwordEngine::~SwordEngine() {
 	delete _resMan;
 }
 
-int SwordEngine::init(GameDetector &detector) {
+int SwordEngine::init() {
 
 	_system->beginGFXTransaction();
-		initCommonGFX(detector, true);
+		initCommonGFX(true);
 		_system->initSize(640, 480);
 	_system->endGFXTransaction();
 
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index a41685ad75..50c0150743 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -25,7 +25,6 @@
 
 #include "base/engine.h"
 #include "common/util.h"
-#include "base/gameDetector.h"
 #include "sword1/sworddefs.h"
 
 namespace Sword1 {
@@ -71,7 +70,7 @@ struct SystemVars {
 class SwordEngine : public Engine {
 	void errorString(const char *buf_input, char *buf_output);
 public:
-	SwordEngine(GameDetector *detector, OSystem *syst);
+	SwordEngine(OSystem *syst);
 	virtual ~SwordEngine();
 	static SystemVars _systemVars;
 	void reinitialize(void);
@@ -79,7 +78,7 @@ public:
 	uint32 _features;
 protected:
 	int go();
-	int init(GameDetector &detector);
+	int init();
 private:
 	void delay(int32 amount);