- 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

3 files changed, 4 insertions, 8 deletions

diff --git a/engines/simon/game.cpp b/engines/simon/game.cpp
index 29d1df7bfb..0adf22cb65 100644
--- a/engines/simon/game.cpp
+++ b/engines/simon/game.cpp
@@ -24,7 +24,6 @@
 
 #include "backends/fs/fs.h"
 
-#include "base/gameDetector.h"
 #include "base/plugins.h"
 
 #include "common/config-manager.h"
@@ -112,7 +111,7 @@ DetectedGameList Engine_SIMON_detectGames(const FSList &fslist) {
 	return Simon::GAME_detectGames(fslist);
 }
 
-Engine *Engine_SIMON_create(GameDetector *detector, OSystem *syst) {
+Engine *Engine_SIMON_create(OSystem *syst) {
 	const char *gameid = ConfMan.get("gameid").c_str();
 
 	for (const ObsoleteGameID *o = obsoleteGameIDsTable; o->from; ++o) {
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index 9cade56ed5..405d2dbe7e 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -24,7 +24,6 @@
 
 #include "backends/fs/fs.h"
 
-#include "base/gameDetector.h"
 
 #include "common/config-manager.h"
 #include "common/file.h"
@@ -484,7 +483,7 @@ SimonEngine::SimonEngine(OSystem *syst)
 	File::addDefaultDirectory(_gameDataPath + "SPEECH/");
 }
 
-int SimonEngine::init(GameDetector &detector) {
+int SimonEngine::init() {
 
 	// Detect game
 	if (!initGame()) {
@@ -509,7 +508,7 @@ int SimonEngine::init(GameDetector &detector) {
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 
 	_system->beginGFXTransaction();
-		initCommonGFX(detector, getGameType() == GType_FF);
+		initCommonGFX(getGameType() == GType_FF);
 		_system->initSize(_screenWidth, _screenHeight);
 	_system->endGFXTransaction();
 
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index cbe6c7935e..52a292014c 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -35,8 +35,6 @@
 #include "simon/sound.h"
 #include "simon/vga.h"
 
-class GameDetector;
-
 namespace Simon {
 
 /* Various other settings */
@@ -1044,7 +1042,7 @@ protected:
 
 	void resfile_read(void *dst, uint32 offs, uint32 size);
 
-	int init(GameDetector &detector);
+	int init();
 	int go();
 	void openGameFile();