diff options
| author | Bendegúz | 2016-03-04 21:25:17 +0100 |
|---|---|---|
| committer | WinterGrascph | 2016-03-05 15:33:34 +0100 |
| commit | 82e73c38fcbdd04b45dfe7c2bc68d1ca125fada8 (patch) | |
| tree | 7d3ed18127159310cf542159c21e3a8a2af759aa /engines/lab | |
| parent | 445980f010e236edf7af19673f4f01f5ed5a97ab (diff) | |
| download | scummvm-rg350-82e73c38fcbdd04b45dfe7c2bc68d1ca125fada8.tar.gz scummvm-rg350-82e73c38fcbdd04b45dfe7c2bc68d1ca125fada8.tar.bz2 scummvm-rg350-82e73c38fcbdd04b45dfe7c2bc68d1ca125fada8.zip | |
LAB: Process events during ending sequence
LAB: Fix bug #7022 - Events not processed during ending sequence
Diffstat (limited to 'engines/lab')
| -rw-r--r-- | engines/lab/processroom.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index 44c8d65d7c..5093e8ef85 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -238,6 +238,8 @@ void LabEngine::doActions(const ActionList &actionList) { ActionList::const_iterator action; for (action = actionList.begin(); action != actionList.end(); ++action) { updateEvents(); + if (_quitLab || shouldQuit()) + return; switch (action->_actionType) { case kActionPlaySound: @@ -381,6 +383,8 @@ void LabEngine::doActions(const ActionList &actionList) { while (_system->getMillis() < targetMillis) { updateEvents(); + if (_quitLab || shouldQuit()) + return; _anim->diffNextFrame(); } } @@ -409,6 +413,8 @@ void LabEngine::doActions(const ActionList &actionList) { case kActionWaitSound: // used in scene 44 (heart of the labyrinth / ending) while (_music->isSoundEffectActive()) { updateEvents(); + if (_quitLab || shouldQuit()) + return; _anim->diffNextFrame(); waitTOF(); } |