- 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, 4 insertions, 7 deletions

diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 636b12683b..f3b286a5ea 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -24,7 +24,6 @@
 
 #include "backends/fs/fs.h"
 
-#include "base/gameDetector.h"
 #include "base/plugins.h"
 
 #include "common/config-manager.h"
@@ -111,7 +110,7 @@ DetectedGameList Engine_SKY_detectGames(const FSList &fslist) {
 	return detectedGames;
 }
 
-Engine *Engine_SKY_create(GameDetector *detector, OSystem *syst) {
+Engine *Engine_SKY_create(OSystem *syst) {
 	return new Sky::SkyEngine(syst);
 }
 
@@ -306,9 +305,9 @@ int SkyEngine::go() {
 	return 0;
 }
 
-int SkyEngine::init(GameDetector &detector) {
+int SkyEngine::init() {
 	_system->beginGFXTransaction();
-		initCommonGFX(detector, false);
+		initCommonGFX(false);
 		_system->initSize(320, 200);
 	_system->endGFXTransaction();
 
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index 00f16a0ea6..40b4630597 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -26,8 +26,6 @@
 #include "common/stdafx.h"
 #include "base/engine.h"
 
-class GameDetector;
-
 namespace Sky {
 
 struct SystemVars {
@@ -98,7 +96,7 @@ protected:
 
 	uint32 _lastSaveTime;
 
-	int init(GameDetector &detector);
+	int init();
 	void initItemList();
 
 	void initVirgin();