aboutsummaryrefslogtreecommitdiff
path: root/sky
diff options
context:
space:
mode:
authorMax Horn2003-12-12 14:40:40 +0000
committerMax Horn2003-12-12 14:40:40 +0000
commit9008abc7ea34e21d5be2ef9c8a3132d18b8f9374 (patch)
tree312373b86e37e93a4be46f4c101f725cd201972c /sky
parentbaf2fd3900348202fba59f91898c5c91f5104b56 (diff)
downloadscummvm-rg350-9008abc7ea34e21d5be2ef9c8a3132d18b8f9374.tar.gz
scummvm-rg350-9008abc7ea34e21d5be2ef9c8a3132d18b8f9374.tar.bz2
scummvm-rg350-9008abc7ea34e21d5be2ef9c8a3132d18b8f9374.zip
cleanup: no need to access detector->_game.midi, since the value is fixed anyway
svn-id: r11596
Diffstat (limited to 'sky')
-rw-r--r--sky/sky.cpp3
-rw-r--r--sky/sky.h1
2 files changed, 1 insertions, 3 deletions
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);