aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse_digi
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-01-19 19:25:11 +0000
committerPaweł Kołodziejski2004-01-19 19:25:11 +0000
commitbb8f1568820a4cf7385627d360876c88a0001fcf (patch)
tree147b50ff58f7611a32d03a850cb9ef02310107c9 /scumm/imuse_digi
parent7e42cd74afd4f989425944a1357200c67dfc1945 (diff)
downloadscummvm-rg350-bb8f1568820a4cf7385627d360876c88a0001fcf.tar.gz
scummvm-rg350-bb8f1568820a4cf7385627d360876c88a0001fcf.tar.bz2
scummvm-rg350-bb8f1568820a4cf7385627d360876c88a0001fcf.zip
improved fade param for dig demo
svn-id: r12514
Diffstat (limited to 'scumm/imuse_digi')
-rw-r--r--scumm/imuse_digi/dimuse.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 3d488a89de..fba27316c6 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -447,8 +447,13 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int
break;
case 14: // ImuseFadeParam
switch (sub_cmd) {
- case 0x600: // set new volume with fading
- setFade(soundId, d, e);
+ case 0x600: // set volume fading
+ if ((d != 0) && (e == 0))
+ setVolume(soundId, d);
+ else if ((d == 0) && (e == 0))
+ stopSound(soundId);
+ else
+ setFade(soundId, d, e);
break;
default:
warning("IMuseDigital::doCommand FadeParam DEFAULT sub command %d", sub_cmd);
@@ -465,11 +470,11 @@ void IMuseDigital::parseScriptCmds(int a, int b, int c, int d, int e, int f, int
debug(5, "ImuseSetState (%d)", b);
if ((_vm->_gameId == GID_DIG) && (_vm->_features & GF_DEMO)) {
if (b == 1) {
- fadeOutMusic(120);
+ fadeOutMusic(200);
startMusic(1, false, 127, false);
} else {
if (getSoundStatus(2) == 0) {
- fadeOutMusic(120);
+ fadeOutMusic(200);
startMusic(2, false, 127, false);
}
}