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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Dec 27 16:23:57 CET 2009


Revision: 46649
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46649&view=rev
Author:   thebluegr
Date:     2009-12-27 15:23:56 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
Added some currently disabled code to be used when sound fading is done (needs testing)

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-27 14:27:36 UTC (rev 46648)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 15:23:56 UTC (rev 46649)
@@ -373,9 +373,18 @@
 		if (pSnd->volume + pSnd->fadeStep > pSnd->fadeTo) {
 			pSnd->volume = pSnd->fadeTo;
 			pSnd->fadeStep = 0;
-		} else
+		} else {
 			pSnd->volume += pSnd->fadeStep;
+		}
+
 		pSnd->pMidiParser->setVolume(pSnd->volume);
+
+		if (pSnd->fadeStep == 0) {
+			// Signal the engine scripts that the sound is done fading
+			// FIXME: is this correct?
+			//SegManager *segMan = ((SciEngine *)g_engine)->getEngineState()->_segMan;	// HACK
+			//PUT_SEL32V(segMan, pSnd->soundObj, signal, SIGNAL_OFFSET);
+		}
 	}
 }
 


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




More information about the Scummvm-git-logs mailing list