diff options
| author | Johannes Schickel | 2011-07-10 05:21:25 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-07-10 05:21:25 +0200 |
| commit | abbd29b16ab8f4c893415c630bb529b0e4c194ab (patch) | |
| tree | e6909f45f3a19fbb7ab369c0ff0463a4aead63ca /engines/scumm/imuse/sysex_scumm.cpp | |
| parent | 0a94fc5b7bed22f846f2d28797107496454b0ecb (diff) | |
| download | scummvm-rg350-abbd29b16ab8f4c893415c630bb529b0e4c194ab.tar.gz scummvm-rg350-abbd29b16ab8f4c893415c630bb529b0e4c194ab.tar.bz2 scummvm-rg350-abbd29b16ab8f4c893415c630bb529b0e4c194ab.zip | |
SCUMM: Limit iMuse default instrument load to PC Speaker output.
Albeit the code is marked as a hack inside the source, the original behaved
exaclty the same. If the code is removed the PC Speaker output will miss notes,
since unlike the original we only output to parts, which have an instrument set
up.
Diffstat (limited to 'engines/scumm/imuse/sysex_scumm.cpp')
| -rw-r--r-- | engines/scumm/imuse/sysex_scumm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index 160cdf500a..035953f140 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -93,9 +93,9 @@ void sysexHandler_Scumm(Player *player, const byte *msg, uint16 len) { // anyway. if (player->_isMIDI) { part->_instrument.program((p[15] & 0x0F) << 4 |(p[16] & 0x0F), player->_isMT32); - } else { + } else if (se->_pcSpeaker) { // FIXME/HACK: This is only needed here, since when we use the following line: - // se->copyGlobalAdLibInstrument((p[15] & 0x0F) << 4 |(p[16] & 0x0F), &part->_instrument); + // se->copyGlobalInstrument((p[15] & 0x0F) << 4 |(p[16] & 0x0F), &part->_instrument); // We would not get any instrument for PC Speaker. Because we don't default to an // "empty" instrument in case the global instrument specified is not set up. byte empty[23] = {0}; |