aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaweł Kołodziejski2008-01-13 00:15:43 +0000
committerPaweł Kołodziejski2008-01-13 00:15:43 +0000
commitd27c118acc455b57ba988b0bbbb681fc36914ee9 (patch)
tree4de77bf10eca00bae455444b100efc43aa2b6337 /engines
parent6b34fcc2b4f8933110d32c80eebb871bb398c91f (diff)
downloadscummvm-rg350-d27c118acc455b57ba988b0bbbb681fc36914ee9.tar.gz
scummvm-rg350-d27c118acc455b57ba988b0bbbb681fc36914ee9.tar.bz2
scummvm-rg350-d27c118acc455b57ba988b0bbbb681fc36914ee9.zip
additional missing stoppingSequence to music transitions.
svn-id: r30464
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/imuse_digi/dimuse_music.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp
index 8003ea646e..3def3be747 100644
--- a/engines/scumm/imuse_digi/dimuse_music.cpp
+++ b/engines/scumm/imuse_digi/dimuse_music.cpp
@@ -178,6 +178,8 @@ void IMuseDigital::playDigMusic(const char *songName, const imuseDigTable *table
if (table->filename[0] == 0) {
return;
}
+ if (table->transitionType == 4)
+ _stopingSequence = true;
if ((!sequence) && (table->attribPos != 0) &&
(table->attribPos == _digStateMusicTable[_curMusicState].attribPos)) {
startMusic(table->filename, table->soundId, 0, 127);
@@ -320,6 +322,8 @@ void IMuseDigital::playComiMusic(const char *songName, const imuseComiTable *tab
fadeOutMusic(60);
return;
}
+ if (table->transitionType == 4)
+ _stopingSequence = true;
if ((!sequence) && (table->attribPos != 0) &&
(table->attribPos == _comiStateMusicTable[_curMusicState].attribPos)) {
fadeOutMusic(120); // expiremental fadeDelay 120 instead from table