aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound
diff options
context:
space:
mode:
authorMatthew Hoops2010-02-02 19:39:02 +0000
committerMatthew Hoops2010-02-02 19:39:02 +0000
commit35d2f48fc11fb837398ac3d5a0bab3b881a55abc (patch)
tree6a5ca511c5084e364b6b9da0f439646a2db0a261 /engines/sci/sound
parentaf6648fbb0e756f0fdbfb2f77ffa5ca8a2cf1547 (diff)
downloadscummvm-rg350-35d2f48fc11fb837398ac3d5a0bab3b881a55abc.tar.gz
scummvm-rg350-35d2f48fc11fb837398ac3d5a0bab3b881a55abc.tar.bz2
scummvm-rg350-35d2f48fc11fb837398ac3d5a0bab3b881a55abc.zip
Use MIDI by default for SCI32. Fixes the GK2 demo.
svn-id: r47819
Diffstat (limited to 'engines/sci/sound')
-rw-r--r--engines/sci/sound/music.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index d81f2c8056..e1446063af 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -61,7 +61,14 @@ void SciMusic::init() {
// SCI sound init
_dwTempo = 0;
- MidiDriverType midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI);
+ MidiDriverType midiType;
+
+#ifdef ENABLE_SCI32
+ if (getSciVersion() >= SCI_VERSION_2)
+ midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MIDI);
+ else
+#endif
+ midiType = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB | MDT_MIDI);
switch (midiType) {
case MD_ADLIB: