[Scummvm-cvs-logs] scummvm master -> 9ad4ad1abc75e6393617ea9c5ca8fdfc2c8de6c4

bluegr md5 at scummvm.org
Thu Feb 24 01:18:43 CET 2011


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:
9ad4ad1abc SCI: Fixed two bugs related to music fading


Commit: 9ad4ad1abc75e6393617ea9c5ca8fdfc2c8de6c4
    https://github.com/scummvm/scummvm/commit/9ad4ad1abc75e6393617ea9c5ca8fdfc2c8de6c4
Author: md5 (md5 at scummvm.org)
Date: 2011-02-23T16:17:28-08:00

Commit Message:
SCI: Fixed two bugs related to music fading

- bug #3037594: "KQ5: Music not fading when brigands leave temple"
- bug #3044844: "LONGBOW: Intro skips each first verse of song"

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



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 45a3e09..0017fe0 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -445,9 +445,13 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 
 	if (musicSlot->fadeCompleted) {
 		musicSlot->fadeCompleted = false;
-		// We need signal for sci0 at least in iceman as well (room 14, fireworks)
-		writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 		if (_soundVersion <= SCI_VERSION_0_LATE) {
+			// We need signal for sci0 at least in iceman as well (room 14, fireworks)
+			// Note: We should not set the signal here when fading is done in later
+			// games. This fixes the dialog boxes disappearing too quickly in the
+			// intro of Longbow (bug #3044844). It also fixes the music not fading out
+			// when the bandits leave the temple in KQ5 (bug #3037594).
+			writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 			processStopSound(obj, false);
 		} else {
 			if (musicSlot->stopAfterFading)






More information about the Scummvm-git-logs mailing list