[Scummvm-cvs-logs] scummvm master -> 173a022f91ffb888292ced1a8a4756db5eaca9b1

[wjp]

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

Summary:
d0d9894b22 SCI: Revert "Fixed fading-related bugs #3267956 and #3041738"
173a022f91 SCI: Clarify comment


Commit: d0d9894b22cbd0030ceee66c40f4d8f6bff7ff16
    https://github.com/scummvm/scummvm/commit/d0d9894b22cbd0030ceee66c40f4d8f6bff7ff16
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-04-06T11:46:15-07:00

Commit Message:
SCI: Revert "Fixed fading-related bugs #3267956 and #3041738"

This reverts commit bfef0f5a6fabdef5bb42cffd8b078d4511cf2a80.

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



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 737a130..fb4564d 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -377,14 +377,6 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) {
 		return acc;
 	}
 
-	// If the current volume of the slot is the same as the target volume,
-	// return without performing any fading. This fixes the music in room
-	// 406 in KQ6 (bug #3267956), where the game scripts ask for the background
-	// music to be played, and then faded to volume 127 (but the music is
-	// already at volume 127) and subsequently stopped.
-	if (argc >= 4 && musicSlot->volume == CLIP<uint16>(argv[1].toUint16(), 0, MUSIC_VOLUME_MAX))
-		return acc;
-
 	switch (argc) {
 	case 1: // SCI0
 		// SCI0 fades out all the time and when fadeout is done it will also


Commit: 173a022f91ffb888292ced1a8a4756db5eaca9b1
    https://github.com/scummvm/scummvm/commit/173a022f91ffb888292ced1a8a4756db5eaca9b1
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-04-06T11:48:52-07:00

Commit Message:
SCI: Clarify comment

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



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index fb4564d..f3375e7 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -402,9 +402,11 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) {
 			musicSlot->fadeStep = volume > musicSlot->fadeTo ? -5 : 5;
 		musicSlot->fadeTickerStep = argv[2].toUint16() * 16667 / _music->soundGetTempo();
 		musicSlot->fadeTicker = 0;
-		// TODO: We handle this as a bit field (i.e. containing values 0 and 1),
-		// but some games pass other values here as well (e.g. some KQ6 scripts
-		// pass 3 here)
+
+		// argv[4] is a boolean. Scripts sometimes pass strange values,
+		// but SSCI ignores these. (Verified in KQ6.)
+		// KQ6 room 460 even passes an object, but treating this as 'true'
+		// seems fine in that case.
 		musicSlot->stopAfterFading = (argc == 5) ? (argv[4].toUint16() != 0) : false;
 		break;