[Scummvm-cvs-logs] SF.net SVN: scummvm:[50995] scummvm/trunk/engines/sci/sound

[m_kiewitz at users.sourceforge.net]

Revision: 50995
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50995&view=rev
Author:   m_kiewitz
Date:     2010-07-18 16:22:16 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
SCI: if game starts fading, stops music and later starts music again don't resume fading - fixes lsl6 music when going in from swimming pool

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp
    scummvm/trunk/engines/sci/sound/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-07-18 16:02:16 UTC (rev 50994)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-07-18 16:22:16 UTC (rev 50995)
@@ -388,6 +388,7 @@
 		}
 	}
 
+	pSnd->fadeStep = 0; // just make sure that previous fading isn't continued
 	pSnd->status = kSoundPlaying;
 }
 

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-18 16:02:16 UTC (rev 50994)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-07-18 16:22:16 UTC (rev 50995)
@@ -300,7 +300,7 @@
 
 	// If sound is not playing currently, set signal directly
 	if (musicSlot->status != kSoundPlaying) {
-		debugC(2, kDebugLevelSound, "kDoSound(fade): fading requested, but sound is currently not playing");
+		debugC(2, kDebugLevelSound, "kDoSound(fade): %04x:%04x fading requested, but sound is currently not playing", PRINT_REG(obj));
 		writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
 		return acc;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.