aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2008-01-19 17:13:53 +0000
committerPaweł Kołodziejski2008-01-19 17:13:53 +0000
commit62d4b44502597f55a393059e1f8a54106dd8cb8e (patch)
treef88de8431edd2950070adb15ff157dc1e99b9d91 /engines/scumm
parent72d59da6cb42f354f8e1b786858d573c0740f9ae (diff)
downloadscummvm-rg350-62d4b44502597f55a393059e1f8a54106dd8cb8e.tar.gz
scummvm-rg350-62d4b44502597f55a393059e1f8a54106dd8cb8e.tar.bz2
scummvm-rg350-62d4b44502597f55a393059e1f8a54106dd8cb8e.zip
revert code to fade out first region if jump hit
svn-id: r30566
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 71a2977b83..35a39ad9f3 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -347,7 +347,6 @@ void IMuseDigital::switchToNextRegion(Track *track) {
}
int num_regions = _sound->getNumRegions(track->soundDesc);
- int previous_region = track->curRegion;
if (++track->curRegion == num_regions) {
flushTrack(track);
@@ -385,7 +384,7 @@ void IMuseDigital::switchToNextRegion(Track *track) {
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) {