diff options
| author | James Brown | 2003-01-09 08:23:44 +0000 |
|---|---|---|
| committer | James Brown | 2003-01-09 08:23:44 +0000 |
| commit | 2cefb8a4a846f487f7aab72ba414ad60e09e0b83 (patch) | |
| tree | fa86e0100c75a94df440696fb521466b36426f88 /scumm/imuse_digi.cpp | |
| parent | 819a96d05bbc79eff8453b1206c986638fa766f1 (diff) | |
| download | scummvm-rg350-2cefb8a4a846f487f7aab72ba414ad60e09e0b83.tar.gz scummvm-rg350-2cefb8a4a846f487f7aab72ba414ad60e09e0b83.tar.bz2 scummvm-rg350-2cefb8a4a846f487f7aab72ba414ad60e09e0b83.zip | |
Disable smush again, and apply patch 664890 ('Silencing the music')
svn-id: r6366
Diffstat (limited to 'scumm/imuse_digi.cpp')
| -rw-r--r-- | scumm/imuse_digi.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp index 15eb5da94e..92fab59a5c 100644 --- a/scumm/imuse_digi.cpp +++ b/scumm/imuse_digi.cpp @@ -1031,6 +1031,8 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i tmp /= 2; } _channel[chan]._volumeFadeStep = tmp; + printf("volumeFade is %d, step is %d\n", d, tmp); + return 0; default: warning("IMuseDigital::doCommand 14 DEFAULT sub command %d", sub_cmd); @@ -1059,6 +1061,12 @@ int32 IMuseDigital::doCommand(int a, int b, int c, int d, int e, int f, int g, i } } } else if (_scumm->_gameId == GID_CMI) { + if (b == 1000) { // STATE_NULL + // FIXME: Fade this out properly, in the same increments as the real engine + _scumm->_sound->stopBundleMusic(); + return 0; + } + for(l = 0;; l++) { if (_comiStateMusicTable[l].index == -1) { return 1; |