cut down on unnecessary GameDetector references

svn-id: r11239

2 files changed, 6 insertions, 4 deletions

diff --git a/queen/queen.cpp b/queen/queen.cpp
index 08e2bfb43c..5e6cbd9a14 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -88,7 +88,7 @@ REGISTER_PLUGIN("Flight of the Amazon Queen", Engine_QUEEN_gameList, Engine_QUEE
 namespace Queen {
 
 QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
-	: Engine(detector, syst) {
+	: Engine(syst) {
 
 	if (!_mixer->bindToSystem(syst))
 		warning("Sound initialisation failed.");
@@ -97,7 +97,7 @@ QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
 
 	_debugMode = ConfMan.hasKey("debuglevel");
 	_debugLevel = ConfMan.getInt("debuglevel");
-	_detector = detector;
+	_detectname = detector->_game.detectname;
 
 	_fastMode = 0;
 
@@ -218,7 +218,7 @@ void QueenEngine::go() {
 }
 
 void QueenEngine::initialise(void) {
-	_resource = new Resource(_gameDataPath, _detector->_game.detectname,  _system->get_savefile_manager(), getSavePath());
+	_resource = new Resource(_gameDataPath, _detectname,  _system->get_savefile_manager(), getSavePath());
 	_input = new Input(_resource->getLanguage(), _system);
 	_display = new Display(_system, _input);
 	_graphics = new Graphics(_display, _input, _resource);
diff --git a/queen/queen.h b/queen/queen.h
index 6596654320..8151b87920 100644
--- a/queen/queen.h
+++ b/queen/queen.h
@@ -30,6 +30,8 @@
 #include "queen/resource.h"
 #include "queen/logic.h"
 
+class GameDetector;
+
 namespace Queen {
 
 class Graphics;
@@ -57,7 +59,7 @@ protected:
 	Display *_display;
 	Sound *_sound;
 	
-	GameDetector *_detector; // necessary for music
+	const char *_detectname; // necessary for music
 	
 public:
 	QueenEngine(GameDetector *detector, OSystem *syst);