[Scummvm-cvs-logs] SF.net SVN: scummvm:[46798] scummvm/trunk/engines/sci/sfx/music.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 46798
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46798&view=rev
Author:   m_kiewitz
Date:     2009-12-31 12:38:17 +0000 (Thu, 31 Dec 2009)

Log Message:
-----------
SCI/new music: trigger signal when fade is completed, fixes lsl1 dance with girl

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

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-31 11:14:13 UTC (rev 46797)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-31 12:38:17 UTC (rev 46798)
@@ -372,11 +372,12 @@
 	else {
 		fadeTicker = fadeTickerStep;
 		volume += fadeStep;
+		SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan;	// HACK
 		if (((fadeStep > 0) && (volume >= fadeTo)) || ((fadeStep < 0) && (volume <= fadeTo))) {
 			volume = fadeTo;
 			fadeStep = 0;
+			PUT_SEL32V(segMan, soundObj, signal, 0xFFFF);
 		}
-		SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan;	// HACK
 		PUT_SEL32V(segMan, soundObj, vol, volume);
 
 		pMidiParser->setVolume(volume);


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