From 9008abc7ea34e21d5be2ef9c8a3132d18b8f9374 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 12 Dec 2003 14:40:40 +0000
Subject: cleanup: no need to access detector->_game.midi, since the value is
 fixed anyway

svn-id: r11596
---
 sky/sky.cpp | 3 +--
 sky/sky.h   | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'sky')

diff --git a/sky/sky.cpp b/sky/sky.cpp
index 1508a11020..7c408e4a8a 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -122,7 +122,6 @@ SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
 	
 	_debugMode = ConfMan.hasKey("debuglevel");
 	_debugLevel = ConfMan.getInt("debuglevel");
-	_midi = detector->_game.midi;
 
 	_floppyIntro = ConfMan.getBool("floppy_intro");
 
@@ -256,7 +255,7 @@ void SkyEngine::initialise(void) {
 	
 	_systemVars.gameVersion = _skyDisk->determineGameVersion();
 
-	int midiDriver = GameDetector::detectMusicDriver(_midi);
+	int midiDriver = GameDetector::detectMusicDriver(skySetting.midi);
 	if (midiDriver == MD_ADLIB) {
 		_systemVars.systemFlags |= SF_SBLASTER;
 		_skyMusic = new SkyAdlibMusic(_mixer, _skyDisk, _system);
diff --git a/sky/sky.h b/sky/sky.h
index 2d2660b288..a0ab6b6c93 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -77,7 +77,6 @@ protected:
 
 	SkyMusicBase *_skyMusic;
 	SkyIntro *_skyIntro;
-	int _midi; // necessary for music
 	
 public:
 	SkyEngine(GameDetector *detector, OSystem *syst);
-- 
cgit v1.2.3