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

[aquadran at users.sourceforge.net]

Revision: 30117
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30117&view=rev
Author:   aquadran
Date:     2008-01-01 07:05:27 -0800 (Tue, 01 Jan 2008)

Log Message:
-----------
experimental change to prevent play first region with fade out if jump opcode is attached

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-01 13:00:47 UTC (rev 30116)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2008-01-01 15:05:27 UTC (rev 30117)
@@ -385,6 +385,7 @@
 	}
 
 	int num_regions = _sound->getNumRegions(track->soundDesc);
+	int previous_region = track->curRegion;
 
 	if (++track->curRegion == num_regions) {
 		flushTrack(track);
@@ -404,7 +405,7 @@
 		int fadeDelay = (60 * _sound->getJumpFade(soundDesc, jumpId)) / 1000;
 		if (sampleHookId != 0) {
 			if (track->curHookId == sampleHookId) {
-				if (fadeDelay != 0) {
+				if (fadeDelay != 0 && previous_region != -1) {
 					Track *fadeTrack = cloneToFadeOutTrack(track, fadeDelay);
 					if (fadeTrack) {
 						fadeTrack->dataOffset = _sound->getRegionOffset(fadeTrack->soundDesc, fadeTrack->curRegion);
@@ -418,7 +419,7 @@
 				track->curHookId = 0;
 			}
 		} else {
-			if (fadeDelay != 0) {
+			if (fadeDelay != 0 && previous_region != -1) {
 				Track *fadeTrack = cloneToFadeOutTrack(track, fadeDelay);
 				if (fadeTrack) {
 					fadeTrack->dataOffset = _sound->getRegionOffset(fadeTrack->soundDesc, fadeTrack->curRegion);


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