diff options
| -rw-r--r-- | scumm/imuse_digi.cpp | 8 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 6 |
2 files changed, 11 insertions, 3 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; diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 42f6ae7a7f..186e95d7ee 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1310,9 +1310,9 @@ void Scumm_v8::o8_startVideo() warning("o8_startVideo(%s/%s)", getGameDataPath(), (char*)_scriptPointer); - ScummRenderer * sr = new ScummRenderer(this, 1000/14); - SmushPlayer * sp = new SmushPlayer(sr); - sp->play((char*)_scriptPointer, getGameDataPath()); + //ScummRenderer * sr = new ScummRenderer(this, 1000/14); + //SmushPlayer * sp = new SmushPlayer(sr); + //sp->play((char*)_scriptPointer, getGameDataPath()); _scriptPointer += len + 1; } |