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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sat Jan 2 16:59:00 CET 2010


Revision: 46888
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46888&view=rev
Author:   thebluegr
Date:     2010-01-02 15:58:55 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
Notify the game scripts when fading effect is done

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

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-02 15:54:08 UTC (rev 46887)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-02 15:58:55 UTC (rev 46888)
@@ -806,10 +806,13 @@
 				// Check if this signal is the end of the track or the end of fading effect.
 				// If this came from a fading effect, don't stop the track here, it'll be stopped
 				// by the engine scripts
-				if (musicSlot->fadeSetVolume)
+				if (musicSlot->fadeSetVolume) {
 					musicSlot->fadeSetVolume = false;
-				else
+					// Notify the game scripts that music fading is done
+					PUT_SEL32V(_segMan, obj, signal, SIGNAL_OFFSET);
+				} else {
 					cmdStopSound(obj, 0);
+				}
 				break;
 			default:
 				// Sync the signal of the sound object


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