diff options
| author | Filippos Karapetis | 2011-09-24 18:44:57 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-09-24 18:46:55 +0300 |
| commit | e552bc57baf616daae8fb8831b6bf10c933db106 (patch) | |
| tree | ab251668c612a33e0661ed545dcb7f41ec1bac98 | |
| parent | 5e47c2cfb19a974bcb092e9a8cc6d6bf75f474ff (diff) | |
| download | scummvm-rg350-e552bc57baf616daae8fb8831b6bf10c933db106.tar.gz scummvm-rg350-e552bc57baf616daae8fb8831b6bf10c933db106.tar.bz2 scummvm-rg350-e552bc57baf616daae8fb8831b6bf10c933db106.zip | |
SCI: Always reset hold when starting a new song. Fixes bug #3413589 - "SCI: KQ6CD: Game stops responding in the catacombs"
kDoSoundSetHold is always called after kDoSoundPlay. A regression from
commit 4f3b85f4efc05affb7b4a7080e349360a3352048
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index e73df69375..b723117811 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -163,6 +163,9 @@ void SoundCommandParser::processPlaySound(reg_t obj) { musicSlot->loop = readSelectorValue(_segMan, obj, SELECTOR(loop)); musicSlot->priority = readSelectorValue(_segMan, obj, SELECTOR(priority)); + // Reset hold when starting a new song. kDoSoundSetHold is always called after + // kDoSoundPlay to set it properly, if needed. Fixes bug #3413589. + musicSlot->hold = -1; if (_soundVersion >= SCI_VERSION_1_EARLY) musicSlot->volume = readSelectorValue(_segMan, obj, SELECTOR(vol)); |