diff options
| author | Paweł Kołodziejski | 2009-09-23 13:22:12 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2009-09-23 13:22:12 +0000 |
| commit | 227e4e65df7093b2be9b45106b529761a13068dd (patch) | |
| tree | d814f53f3513f61735558c91c2c8a95ea00ebd27 /engines/scumm | |
| parent | c05c5fca0303b053ac47dc3089e05111794df78b (diff) | |
| download | scummvm-rg350-227e4e65df7093b2be9b45106b529761a13068dd.tar.gz scummvm-rg350-227e4e65df7093b2be9b45106b529761a13068dd.tar.bz2 scummvm-rg350-227e4e65df7093b2be9b45106b529761a13068dd.zip | |
fix for bug #2820389
svn-id: r44274
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_script.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/scumm_v7.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp index ea9c47f591..06a629072e 100644 --- a/engines/scumm/imuse_digi/dimuse_script.cpp +++ b/engines/scumm/imuse_digi/dimuse_script.cpp @@ -203,6 +203,11 @@ void IMuseDigital::refreshScripts() { debug(6, "refreshScripts()"); if (_stopingSequence) { + // prevent start new music, only fade out old one + if (_vm->isSmushActive()) { + fadeOutMusic(60); + return; + } // small delay, it seems help for fix bug #1757010 if (_stopingSequence++ > 120) { debug(5, "refreshScripts() Force restore music state"); diff --git a/engines/scumm/scumm_v7.h b/engines/scumm/scumm_v7.h index fcadadb04d..c4bb3525be 100644 --- a/engines/scumm/scumm_v7.h +++ b/engines/scumm/scumm_v7.h @@ -97,6 +97,7 @@ public: void addSubtitleToQueue(const byte *text, const Common::Point &pos, byte color, byte charset); void clearSubtitleQueue(); virtual void CHARSET_1(); + bool isSmushActive() { return _smushActive; } protected: virtual int runDialog(Dialog &dialog); |