[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.65,1.66

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27767

Modified Files:
	dimuse.cpp 
Log Message:
exclude for FT sound loops

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- dimuse.cpp	11 Apr 2004 14:48:50 -0000	1.65
+++ dimuse.cpp	11 Apr 2004 14:56:11 -0000	1.66
@@ -246,20 +246,24 @@
 		int fadeDelay = (60 * _sound->getJumpFade(_track[track]->soundHandle, jumpId)) / 1000;
 		if (sampleHookId != 0) {
 			if (_track[track]->curHookId == sampleHookId) {
-				int fadeTrack = cloneToFadeOutTrack(track, fadeDelay, false);
-				_track[fadeTrack]->dataOffset = _sound->getRegionOffset(_track[fadeTrack]->soundHandle, _track[fadeTrack]->curRegion);
-				_track[fadeTrack]->regionOffset = 0;
-				debug(5, "switchToNextRegion-sound(%d) select %d region, curHookId: %d", _track[fadeTrack]->soundId, _track[fadeTrack]->curRegion, _track[fadeTrack]->curHookId);
+				if (fadeDelay != 0) {
+					int fadeTrack = cloneToFadeOutTrack(track, fadeDelay, false);
+					_track[fadeTrack]->dataOffset = _sound->getRegionOffset(_track[fadeTrack]->soundHandle, _track[fadeTrack]->curRegion);
+					_track[fadeTrack]->regionOffset = 0;
+					debug(5, "switchToNextRegion-sound(%d) select %d region, curHookId: %d", _track[fadeTrack]->soundId, _track[fadeTrack]->curRegion, _track[fadeTrack]->curHookId);
+					_track[fadeTrack]->curHookId = 0;
+				}
 				_track[track]->curRegion = region;
 				debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track]->soundId, _track[track]->curRegion, _track[track]->curHookId);
 				_track[track]->curHookId = 0;
-				_track[fadeTrack]->curHookId = 0;
 			}
 		} else {
-			int fadeTrack = cloneToFadeOutTrack(track, fadeDelay, false);
-			_track[fadeTrack]->dataOffset = _sound->getRegionOffset(_track[fadeTrack]->soundHandle, _track[fadeTrack]->curRegion);
-			_track[fadeTrack]->regionOffset = 0;
-			debug(5, "switchToNextRegion-sound(%d) select %d region, curHookId: %d", _track[fadeTrack]->soundId, _track[fadeTrack]->curRegion, _track[fadeTrack]->curHookId);
+			if (fadeDelay != 0) {
+				int fadeTrack = cloneToFadeOutTrack(track, fadeDelay, false);
+				_track[fadeTrack]->dataOffset = _sound->getRegionOffset(_track[fadeTrack]->soundHandle, _track[fadeTrack]->curRegion);
+				_track[fadeTrack]->regionOffset = 0;
+				debug(5, "switchToNextRegion-sound(%d) select %d region, curHookId: %d", _track[fadeTrack]->soundId, _track[fadeTrack]->curRegion, _track[fadeTrack]->curHookId);
+			}
 			_track[track]->curRegion = region;
 			debug(5, "switchToNextRegion-sound(%d) jump to %d region, curHookId: %d", _track[track]->soundId, _track[track]->curRegion, _track[track]->curHookId);
 		}