diff options
| author | Martin Kiewitz | 2010-05-10 20:32:55 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-10 20:32:55 +0000 |
| commit | a31de2adfa6818da700f82657dec6b79df9638c9 (patch) | |
| tree | bb131ae34097b6af68cc2e26c6706ffd5cb39618 /engines | |
| parent | dce50f2e2d2e925b8f42e10f1d1aaca0b7a8c7c4 (diff) | |
| download | scummvm-rg350-a31de2adfa6818da700f82657dec6b79df9638c9.tar.gz scummvm-rg350-a31de2adfa6818da700f82657dec6b79df9638c9.tar.bz2 scummvm-rg350-a31de2adfa6818da700f82657dec6b79df9638c9.zip | |
SCI: set signal to SIGNAL_OFFSET, when a music slot is played that doesn't contain supported data - fixes lsl5 mud wrestling "regression" in new music/sound code (worked before with old music/sound engine)
svn-id: r49000
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 48b65c2810..2a9842f70b 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -833,7 +833,7 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) { _music->soundSetVolume(musicSlot, musicSlot->volume); musicSlot->fadeSetVolume = false; } - } else { + } else if (musicSlot->pMidiParser) { // Update MIDI slots if (musicSlot->signal == 0) { if (musicSlot->dataInc != GET_SEL32V(_segMan, obj, SELECTOR(dataInc))) { @@ -848,6 +848,11 @@ void SoundCommandParser::cmdUpdateCues(reg_t obj, int16 value) { if (musicSlot->signal == SIGNAL_OFFSET) cmdStopSound(obj, 0); } + } else { + // Slot actually has no data (which would mean that a sound-resource w/ unsupported data is used + // (example lsl5 - sound resource 744 - it's roland exclusive + PUT_SEL32V(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET); + // If we don't set signal here, at least the switch to the mud wrestling room in lsl5 will not work } if (musicSlot->fadeCompleted) { |