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

[bluegr]

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:
6d90b0739a SCI: Show object names in the songlib console command
bfef0f5a6f SCI: Fixed fading-related bugs #3267956 and #3041738


Commit: 6d90b0739a2c96cadee6642a691152c6e9df0895
    https://github.com/scummvm/scummvm/commit/6d90b0739a2c96cadee6642a691152c6e9df0895
Author: md5 (md5 at scummvm.org)
Date: 2011-04-03T09:01:20-07:00

Commit Message:
SCI: Show object names in the songlib console command

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



diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 8656203..c7743ac 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -663,9 +663,11 @@ void SciMusic::printPlayList(Console *con) {
 
 	for (uint32 i = 0; i < _playList.size(); i++) {
 		MusicEntry *song = _playList[i];
-		con->DebugPrintf("%d: %04x:%04x, resource id: %d, status: %s, %s type\n", i,
-						PRINT_REG(song->soundObj), song->resourceId,
-						musicStatus[song->status], song->pMidiParser ? "MIDI" : "digital audio");
+		con->DebugPrintf("%d: %04x:%04x (%s), resource id: %d, status: %s, %s type\n",
+						i, PRINT_REG(song->soundObj),
+						g_sci->getEngineState()->_segMan->getObjectName(song->soundObj),
+						song->resourceId, musicStatus[song->status],
+						song->pMidiParser ? "MIDI" : "digital audio");
 	}
 }
 


Commit: bfef0f5a6fabdef5bb42cffd8b078d4511cf2a80
    https://github.com/scummvm/scummvm/commit/bfef0f5a6fabdef5bb42cffd8b078d4511cf2a80
Author: md5 (md5 at scummvm.org)
Date: 2011-04-03T09:02:14-07:00

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

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



diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 1e6d0ae..9ad964b 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -325,6 +325,14 @@ 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