- 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

1 files changed, 2 insertions, 4 deletions

diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index ee4ef84bf6..489e897afb 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -41,7 +41,6 @@ namespace GUI {
 	class Dialog;
 }
 using GUI::Dialog;
-class GameDetector;
 namespace Common {
 	class InSaveFile;
 	class OutSaveFile;
@@ -445,14 +444,14 @@ protected:
 
 public:
 	// Constructor / Destructor
-	ScummEngine(GameDetector *detector, OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
+	ScummEngine(OSystem *syst, const GameSettings &gs, uint8 md5sum[16], SubstResFileNames subst);
 	virtual ~ScummEngine();
 
 	/** Startup function, main loop. */
 	int go();
 
 	// Init functions
-	int init(GameDetector &detector);
+	int init();
 
 	virtual void setupScummVars();
 	virtual void initScummVars();
@@ -739,7 +738,6 @@ public:
 protected:
 	int _resourceHeaderSize;
 	Common::String _baseName;	// This is the name we use for opening resource files
-	Common::String _targetName;	// This is the game the user calls it, so use for saving
 	byte _resourceMapper[128];
 	byte *_heV7DiskOffsets;
 	uint32 *_heV7RoomIntOffsets;