diff options
| author | Filippos Karapetis | 2015-12-27 14:13:39 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-12-27 14:36:00 +0200 |
| commit | bce260bb5f2d3b573cc0c5a7c0085e18d1d46fd4 (patch) | |
| tree | f1c7364dc691a575268f4237eac6758adc191248 | |
| parent | 86a593af091381663520f422727b8c0b7b66b6e3 (diff) | |
| download | scummvm-rg350-bce260bb5f2d3b573cc0c5a7c0085e18d1d46fd4.tar.gz scummvm-rg350-bce260bb5f2d3b573cc0c5a7c0085e18d1d46fd4.tar.bz2 scummvm-rg350-bce260bb5f2d3b573cc0c5a7c0085e18d1d46fd4.zip | |
LAB: Get rid of _doReset
This resulted in calling resetMusic() twice
| -rw-r--r-- | engines/lab/music.cpp | 3 | ||||
| -rw-r--r-- | engines/lab/music.h | 2 | ||||
| -rw-r--r-- | engines/lab/processroom.cpp | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index c46e3a10ec..4c889ca044 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -58,7 +58,6 @@ Music::Music(LabEngine *vm) : _vm(vm) { _musicOn = false; _queuingAudioStream = nullptr; _lastMusicRoom = 1; - _doReset = true; } void Music::updateMusic() { @@ -220,8 +219,6 @@ void Music::checkRoomMusic() { changeMusic("Music:Laugh"); else if (_vm->_roomNum == DIMROOM) changeMusic("Music:Rm81"); - else if (_doReset) - resetMusic(); _lastMusicRoom = _vm->_roomNum; } diff --git a/engines/lab/music.h b/engines/lab/music.h index 1a3fd24e72..2cd87cd9a6 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -52,7 +52,6 @@ private: Common::File *_file; Common::File *_tFile; - bool _doReset; bool _musicOn; bool _musicPaused; bool _oldMusicOn; @@ -125,7 +124,6 @@ public: * Turns the music on and off. */ void setMusic(bool on); - void setMusicReset(bool reset) { _doReset = reset; } void stopSoundEffect(); /** diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp index e0faa612ab..997eb75dce 100644 --- a/engines/lab/processroom.cpp +++ b/engines/lab/processroom.cpp @@ -386,12 +386,10 @@ void LabEngine::doActions(const ActionList &actionList) { case kActionChangeMusic: _music->changeMusic(action->_messages[0]); - _music->setMusicReset(false); break; case kActionResetMusic: _music->resetMusic(); - _music->setMusicReset(true); break; case kActionFillMusic: |