[Scummvm-cvs-logs] SF.net SVN: scummvm: [30566] scummvm/trunk/engines/scumm/imuse_digi/dimuse. cpp

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sat Jan 19 18:13:54 CET 2008


Revision: 30566
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30566&view=rev
Author:   aquadran
Date:     2008-01-19 09:13:53 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
revert code to fade out first region if jump hit

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-19 16:06:20 UTC (rev 30565)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-19 17:13:53 UTC (rev 30566)
@@ -347,7 +347,6 @@
 	}
 
 	int num_regions = _sound->getNumRegions(track->soundDesc);
-	int previous_region = track->curRegion;
 
 	if (++track->curRegion == num_regions) {
 		flushTrack(track);
@@ -385,7 +384,7 @@
 		debug(5, "SwToNeReg(trackId:%d) - JUMP found - sound:%d, track hookId:%d, data hookId:%d", track->trackId, track->soundId, track->curHookId, sampleHookId);
 		if (track->curHookId == sampleHookId) {
 			debug(5, "SwToNeReg(trackId:%d) - sound(%d) match hookId", track->trackId, track->soundId);
-			if (fadeDelay != 0 && previous_region != -1) {
+			if (fadeDelay) {
 				debug(5, "SwToNeReg(trackId:%d) - call cloneToFadeOutTrack(delay:%d)", track->trackId, fadeDelay);
 				Track *fadeTrack = cloneToFadeOutTrack(track, fadeDelay);
 				if (fadeTrack) {


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