[Scummvm-cvs-logs] scummvm master -> 96540686597cb033281e98de79ddc9622e650057

[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:
51f733b2a6 SCI: Changed debug console hotkey to Control-Shift-D instead of Control-D.
9654068659 SCI: Fixed bug #3266480 and partially fixed bug #3041738


Commit: 51f733b2a6e2413a7a97442fc2389209da8a72f0
    https://github.com/scummvm/scummvm/commit/51f733b2a6e2413a7a97442fc2389209da8a72f0
Author: md5 (md5 at scummvm.org)
Date: 2011-04-03T04:35:54-07:00

Commit Message:
SCI: Changed debug console hotkey to Control-Shift-D instead of Control-D.

Applied from patch #3258985.
The previous hotkey interfered with the hotkeys of some games (e.g.
the "time of day" hotkey in QFG2, bug #3250996).

Changed paths:
    engines/sci/event.cpp



diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index 5024491..6b5ea64 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -185,7 +185,7 @@ SciEvent EventManager::getScummVMEvent() {
 		return noEvent;
 
 	// Check for Control-D (debug console)
-	if (ev.kbd.hasFlags(Common::KBD_CTRL) && ev.kbd.keycode == Common::KEYCODE_d) {
+	if (ev.kbd.hasFlags(Common::KBD_CTRL | Common::KBD_SHIFT) && ev.kbd.keycode == Common::KEYCODE_d) {
 		// Open debug console
 		Console *con = g_sci->getSciDebugger();
 		con->attach();


Commit: 96540686597cb033281e98de79ddc9622e650057
    https://github.com/scummvm/scummvm/commit/96540686597cb033281e98de79ddc9622e650057
Author: md5 (md5 at scummvm.org)
Date: 2011-04-03T04:37:15-07:00

Commit Message:
SCI: Fixed bug #3266480 and partially fixed bug #3041738

Hopefully, this will fix some of the oddities happening because of music fading

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



diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 0ed99c1..8656203 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -442,6 +442,25 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
 		if (pSnd->pMidiParser) {
 			Common::StackLock lock(_mutex);
 			pSnd->pMidiParser->mainThreadBegin();
+
+			if (pSnd->status != kSoundPaused) {
+				// Stop any in progress music fading, as that will reset the
+				// volume of the sound channels that the faded song occupies..
+				// Fixes bug #3266480 and partially fixes bug #3041738.
+				for (uint i = 0; i < playListCount; i++) {
+					// Is another MIDI song being faded? If yes, stop it
+					// immediately instead
+					if (_playList[i]->fadeStep && _playList[i]->pMidiParser) {
+						_playList[i]->status = kSoundStopped;
+						if (_soundVersion <= SCI_VERSION_0_LATE)
+							_playList[i]->isQueued = false;
+						_playList[i]->pMidiParser->stop();
+						freeChannels(_playList[i]);
+						_playList[i]->fadeStep = 0;
+					}
+				}
+			}
+
 			pSnd->pMidiParser->tryToOwnChannels();
 			if (pSnd->status != kSoundPaused)
 				pSnd->pMidiParser->sendInitCommands();