diff options
| author | Johannes Schickel | 2011-07-10 05:13:03 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-07-10 05:13:03 +0200 |
| commit | 0a94fc5b7bed22f846f2d28797107496454b0ecb (patch) | |
| tree | c6fb4685926a22eaaf5cdb3a57fcf090ab882ca0 /engines/scumm | |
| parent | bf4091931d8069c757d98003f9363bbe85358606 (diff) | |
| download | scummvm-rg350-0a94fc5b7bed22f846f2d28797107496454b0ecb.tar.gz scummvm-rg350-0a94fc5b7bed22f846f2d28797107496454b0ecb.tar.bz2 scummvm-rg350-0a94fc5b7bed22f846f2d28797107496454b0ecb.zip | |
SCUMM: Only try to load MT-32 instruments when we have a MIDI output in iMuse.
This fixes the melody in Indy4's intro with the PC Speaker output.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 61b9cad2cb..07c793a4cb 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -371,11 +371,13 @@ void Player::sysEx(const byte *p, uint16 len) { if (a != IMUSE_SYSEX_ID) { if (a == ROLAND_SYSEX_ID) { // Roland custom instrument definition. - part = getPart(p[0] & 0x0F); - if (part) { - part->_instrument.roland(p - 1); - if (part->clearToTransmit()) - part->_instrument.send(part->_mc); + if (_isMIDI || _isMT32) { + part = getPart(p[0] & 0x0F); + if (part) { + part->_instrument.roland(p - 1); + if (part->clearToTransmit()) + part->_instrument.send(part->_mc); + } } } else if (a == YM2612_SYSEX_ID) { // FM-TOWNS custom instrument definition |