libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-17 07:22:41 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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)

Browse Source 
svn-id: r49000
This commit is contained in:
Martin Kiewitz 2010-05-10 20:32:55 +00:00
parent dce50f2e2d
commit a31de2adfa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sci/sound/soundcmd.cpp
View File

@ -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) {