[Scummvm-cvs-logs] scummvm master -> 152b340a9ac502434e99da79e880625626209adc

[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:
152b340a9a SCI: Remove a music fading hack used for the intro of Longbow


Commit: 152b340a9ac502434e99da79e880625626209adc
    https://github.com/scummvm/scummvm/commit/152b340a9ac502434e99da79e880625626209adc
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-06-26T03:22:05-07:00

Commit Message:
SCI: Remove a music fading hack used for the intro of Longbow

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



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 989df7c..cbb5cab 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -368,6 +368,11 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) {
 	case 4: // SCI01+
 	case 5: // SCI1+ (SCI1 late sound scheme), with fade and continue
 		musicSlot->fadeTo = CLIP<uint16>(argv[1].toUint16(), 0, MUSIC_VOLUME_MAX);
+		// Check if the song is already at the requested volume. If it is, don't
+		// perform any fading. Happens for example during the intro of Longbow.
+		if (musicSlot->fadeTo == musicSlot->volume)
+			return acc;
+
 		// sometimes we get objects in that position, fix it up (ffs. workarounds)
 		if (!argv[1].getSegment())
 			musicSlot->fadeStep = volume > musicSlot->fadeTo ? -argv[3].toUint16() : argv[3].toUint16();
@@ -497,12 +502,7 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
 		// fireworks).
 		// It is also needed in other games, e.g. LSL6 when talking to the
 		// receptionist (bug #3192166).
-		if (g_sci->getGameId() == GID_LONGBOW && g_sci->getEngineState()->currentRoomNumber() == 95) {
-			// HACK: Don't set a signal here in the intro of Longbow, as that makes some dialog
-			// boxes disappear too soon (bug #3044844).
-		} else {
-			writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
-		}
+		writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 		if (_soundVersion <= SCI_VERSION_0_LATE) {
 			processStopSound(obj, false);
 		} else {