[Scummvm-cvs-logs] scummvm master -> e552bc57baf616daae8fb8831b6bf10c933db106

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e552bc57ba SCI: Always reset hold when starting a new song. Fixes bug #3413589 - "SCI: KQ6CD: Game stops responding in the catacomb


Commit: e552bc57baf616daae8fb8831b6bf10c933db106
    https://github.com/scummvm/scummvm/commit/e552bc57baf616daae8fb8831b6bf10c933db106
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-24T08:46:55-07:00

Commit Message:
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

Changed paths:
    engines/sci/sound/soundcmd.cpp



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index e73df69..b723117 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));