diff options
author | Filippos Karapetis | 2016-05-17 11:21:33 +0300 |
---|---|---|
committer | Filippos Karapetis | 2016-05-17 11:22:27 +0300 |
commit | b2ec7acbf7b69f914b239f3894045773ef46d6cf (patch) | |
tree | 73bb4e0fa078415fbb64b23f22774c07ed619ad0 /engines/lab/anim.cpp | |
parent | 22e5fe8b4e06b93db1edaf8399394428b349d5e5 (diff) | |
download | scummvm-rg350-b2ec7acbf7b69f914b239f3894045773ef46d6cf.tar.gz scummvm-rg350-b2ec7acbf7b69f914b239f3894045773ef46d6cf.tar.bz2 scummvm-rg350-b2ec7acbf7b69f914b239f3894045773ef46d6cf.zip |
LAB: Fix waiting for sounds embedded in animations
A regression of 75d1385c8d1ba61b5740a0b43966d3c2f111440d
Diffstat (limited to 'engines/lab/anim.cpp')
-rw-r--r-- | engines/lab/anim.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp index 1190f0323b..2dc580735e 100644 --- a/engines/lab/anim.cpp +++ b/engines/lab/anim.cpp @@ -208,6 +208,8 @@ void Anim::diffNextFrame(bool onlyDiffData) { _vm->updateEvents(); _vm->waitTOF(); } + + _waitForEffect = false; } _size -= 8; @@ -217,7 +219,9 @@ void Anim::diffNextFrame(bool onlyDiffData) { _diffFile->skip(2); // Sound effects embedded in animations are started here. These are - // usually animation-specific, like door opening sounds, and are not looped + // usually animation-specific, like door opening sounds, and are not looped. + // The engine should wait for all such sounds to end. + _waitForEffect = true; _vm->_music->playSoundEffect(_sampleSpeed, _size, false, _diffFile); break; @@ -233,6 +237,8 @@ void Anim::diffNextFrame(bool onlyDiffData) { if (drawOnScreen) didTOF = true; } + + _waitForEffect = false; } _isPlaying = false; |