From e34f2b8b3321a576c2ae612470d07cb3e7bc91f5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 10 Nov 2003 01:04:12 +0000
Subject: cut down on unnecessary GameDetector references

svn-id: r11239
---
 sky/sky.cpp | 12 ++++++------
 sky/sky.h   |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'sky')

diff --git a/sky/sky.cpp b/sky/sky.cpp
index 781e91b39e..71c055ae53 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -113,7 +113,7 @@ void **SkyEngine::_itemList[300];
 SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false };
 
 SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
-	: Engine(detector, syst) {
+	: Engine(syst) {
 	
 	if (!_mixer->bindToSystem(syst))
 		warning("Sound initialisation failed.");
@@ -122,7 +122,7 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
 	
 	_debugMode = ConfMan.hasKey("debuglevel");
 	_debugLevel = ConfMan.getInt("debuglevel");
-	_detector = detector;
+	_midi = detector->_game.midi;
 
 	_floppyIntro = ConfMan.getBool("floppy_intro");
 
@@ -256,16 +256,16 @@ void SkyEngine::initialise(void) {
 	
 	_systemVars.gameVersion = _skyDisk->determineGameVersion();
 
-	int midiDriver = GameDetector::detectMusicDriver(_detector->_game.midi);
+	int midiDriver = GameDetector::detectMusicDriver(_midi);
 	if (midiDriver == MD_ADLIB) {
 		_systemVars.systemFlags |= SF_SBLASTER;
 		_skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _system);
 	} else {
 		_systemVars.systemFlags |= SF_ROLAND;
 		if (ConfMan.getBool("native_mt32"))
-			_skyMusic = new SkyMT32Music(_detector->createMidi(midiDriver), _skyDisk, _system);
+			_skyMusic = new SkyMT32Music(GameDetector::createMidi(midiDriver), _skyDisk, _system);
 		else
-			_skyMusic = new SkyGmMusic(_detector->createMidi(midiDriver), _skyDisk, _system);
+			_skyMusic = new SkyGmMusic(GameDetector::createMidi(midiDriver), _skyDisk, _system);
 	}
 
 	if (isCDVersion()) {
@@ -289,7 +289,7 @@ void SkyEngine::initialise(void) {
 	_skyLogic = new SkyLogic(_skyScreen, _skyDisk, _skyText, _skyMusic, _skyMouse, _skySound);
 	_skyMouse->useLogicInstance(_skyLogic);
 	
-	_timer = Engine::_timer; // initialize timer *after* _skyScreen has been initialized.
+	// initialize timer *after* _skyScreen has been initialized.
 	_timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second
 
 	_skyControl = new SkyControl(_skyScreen, _skyDisk, _skyMouse, _skyText, _skyMusic, _skyLogic, _skySound, _system, getSavePath());
diff --git a/sky/sky.h b/sky/sky.h
index 97ae272303..2d2660b288 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -25,6 +25,8 @@
 #include "stdafx.h"
 #include "base/engine.h"
 
+class GameDetector;
+
 struct SystemVars {
 	uint32 systemFlags;
 	uint32 gameVersion;
@@ -75,7 +77,7 @@ protected:
 
 	SkyMusicBase *_skyMusic;
 	SkyIntro *_skyIntro;
-	GameDetector *_detector; // necessary for music
+	int _midi; // necessary for music
 	
 public:
 	SkyEngine(GameDetector *detector, OSystem *syst);
-- 
cgit v1.2.3