diff options
| author | Strangerke | 2015-12-22 19:40:34 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:35:34 +0100 |
| commit | be4c436dcaa960bceedd6d526041df06919bc225 (patch) | |
| tree | f93c0d5b259b2859f93284c4a9916ad7d1c580af /engines/lab/processroom.cpp | |
| parent | 7380ddf40035fa3a3c6d5e7974e8f9928d6e148a (diff) | |
| download | scummvm-rg350-be4c436dcaa960bceedd6d526041df06919bc225.tar.gz scummvm-rg350-be4c436dcaa960bceedd6d526041df06919bc225.tar.bz2 scummvm-rg350-be4c436dcaa960bceedd6d526041df06919bc225.zip | |
LAB: Move event update functions out of updateMusic
Diffstat (limited to 'engines/lab/processroom.cpp')
| -rw-r--r-- | engines/lab/processroom.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index 76592875c9..0d09c37e84 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -235,7 +235,7 @@ bool LabEngine::takeItem(Common::Point pos, CloseDataPtr *closePtrList) { void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { while (actionList) { - _music->updateMusic(); + updateMusicAndEvents(); switch (actionList->_actionType) { case PLAYSOUND: @@ -387,7 +387,7 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { _graphics->screenUpdate(); while (g_system->getMillis() < targetMillis) { - _music->updateMusic(); + updateMusicAndEvents(); _anim->diffNextFrame(); } } @@ -412,12 +412,12 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { break; case FILLMUSIC: - _music->updateMusic(); + updateMusicAndEvents(); break; case WAITSOUND: while (_music->isSoundEffectActive()) { - _music->updateMusic(); + updateMusicAndEvents(); _anim->diffNextFrame(); waitTOF(); } @@ -497,7 +497,7 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { _music->stopSoundEffect(); } else { while (_music->isSoundEffectActive()) { - _music->updateMusic(); + updateMusicAndEvents(); _anim->diffNextFrame(); waitTOF(); } |