aboutsummaryrefslogtreecommitdiff
path: root/kyra
diff options
context:
space:
mode:
authorTorbjörn Andersson2005-12-30 16:36:53 +0000
committerTorbjörn Andersson2005-12-30 16:36:53 +0000
commit1bfae752517cce99ad9cfbd7da7e6b14742700ab (patch)
treee96097d4d3595d1e973938592a2fe562bfa29d38 /kyra
parentb8a0f9659fa72d04dad01147046432d12e140859 (diff)
downloadscummvm-rg350-1bfae752517cce99ad9cfbd7da7e6b14742700ab.tar.gz
scummvm-rg350-1bfae752517cce99ad9cfbd7da7e6b14742700ab.tar.bz2
scummvm-rg350-1bfae752517cce99ad9cfbd7da7e6b14742700ab.zip
Fixed compilation.
svn-id: r19862
Diffstat (limited to 'kyra')
-rw-r--r--kyra/kyra.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp
index e9b452b495..96243c730e 100644
--- a/kyra/kyra.cpp
+++ b/kyra/kyra.cpp
@@ -258,10 +258,10 @@ int KyraEngine::init(GameDetector &detector) {
_system->endGFXTransaction();
// for now we prefer MIDI-to-Adlib conversion over native midi
- int midiDrv = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
- bool native_mt32 = ((midiDrv == MD_MT32) || ConfMan.getBool("native_mt32"));
+ int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
+ bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
- MidiDriver *driver = MidiDriver::createMidi(midiDrv);
+ MidiDriver *driver = MidiDriver::createMidi(midiDriver);
if (midiDriver == MD_ADLIB) {
// In this case we should play the Adlib tracks, but for now
// the automagic MIDI-to-Adlib conversion will do.