diff options
| author | Filippos Karapetis | 2015-12-23 12:55:41 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:43:16 +0100 |
| commit | 9d53245f731a4f4fe53b8e1ddb1f603055583674 (patch) | |
| tree | a02075c620ac98069f4caf791a4a7bbcdb53e68b /engines | |
| parent | 07da047fa1d519190478c1b26e5d65816edb17b3 (diff) | |
| download | scummvm-rg350-9d53245f731a4f4fe53b8e1ddb1f603055583674.tar.gz scummvm-rg350-9d53245f731a4f4fe53b8e1ddb1f603055583674.tar.bz2 scummvm-rg350-9d53245f731a4f4fe53b8e1ddb1f603055583674.zip | |
LAB: Get rid of _waitTillFinished
There is no point waiting for looping sound effects to end
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lab/music.cpp | 1 | ||||
| -rw-r--r-- | engines/lab/music.h | 1 | ||||
| -rw-r--r-- | engines/lab/processroom.cpp | 5 |
3 files changed, 1 insertions, 6 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index a8dd281eb6..4c09d92191 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -60,7 +60,6 @@ Music::Music(LabEngine *vm) : _vm(vm) { _queuingAudioStream = nullptr; _lastMusicRoom = 1; _doReset = true; - _waitTillFinished = false; } void Music::updateMusic() { diff --git a/engines/lab/music.h b/engines/lab/music.h index 857ea81569..42fdf41d67 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -83,7 +83,6 @@ private: public: bool _loopSoundEffect; - bool _waitTillFinished; public: Music(LabEngine *vm); diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index fede42d938..743f408f7e 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -240,20 +240,17 @@ void LabEngine::doActions(Action *actionList, CloseDataPtr *closePtrList) { switch (actionList->_actionType) { case kActionPlaySound: _music->_loopSoundEffect = false; - _music->_waitTillFinished = true; _music->readMusic(actionList->_messages[0], true); - _music->_waitTillFinished = false; break; case kActionPlaySoundNoWait: _music->_loopSoundEffect = false; - _music->_waitTillFinished = false; _music->readMusic(actionList->_messages[0], false); break; case kActionPlaySoundLooping: _music->_loopSoundEffect = true; - _music->readMusic(actionList->_messages[0], _music->_waitTillFinished); + _music->readMusic(actionList->_messages[0], false); break; case kActionShowDiff: |