aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2011-07-10 16:21:30 +0200
committerJohannes Schickel2011-07-10 16:21:30 +0200
commitdab9c05783c56f6c0b0b3faf65921992bc953954 (patch)
treebe3af3a8b586c8b9334378f70dad001162d7eaef /engines
parentfb4ed2224fa744139f800315d1231c8a031d9c75 (diff)
downloadscummvm-rg350-dab9c05783c56f6c0b0b3faf65921992bc953954.tar.gz
scummvm-rg350-dab9c05783c56f6c0b0b3faf65921992bc953954.tar.bz2
scummvm-rg350-dab9c05783c56f6c0b0b3faf65921992bc953954.zip
SCUMM: Do not allow multi midi mode for PC Speaker output.
Thanks to eriktorbjorn for catching this.
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/scumm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 22b02e8e03..5268231cff 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1862,7 +1862,7 @@ void ScummEngine::setupMusic(int midi) {
nativeMidiDriver = MidiDriver::createMidi(dev);
if (nativeMidiDriver != NULL && _native_mt32)
nativeMidiDriver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
- bool multi_midi = ConfMan.getBool("multi_midi") && _musicType != MDT_NONE && (midi & MDT_ADLIB);
+ bool multi_midi = ConfMan.getBool("multi_midi") && _musicType != MDT_NONE && _musicType != MDT_PCSPK && (midi & MDT_ADLIB);
if (_musicType == MDT_ADLIB || _musicType == MDT_TOWNS || multi_midi) {
adlibMidiDriver = MidiDriver::createMidi(MidiDriver::detectDevice(_musicType == MDT_TOWNS ? MDT_TOWNS : MDT_ADLIB));
adlibMidiDriver->property(MidiDriver::PROP_OLD_ADLIB, (_game.features & GF_SMALL_HEADER) ? 1 : 0);