diff options
| author | Filippos Karapetis | 2015-12-27 14:19:44 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-12-27 14:36:00 +0200 |
| commit | e2d019f9d1048a35c7d6b862918e057218a5cab6 (patch) | |
| tree | f984439381439ffc957cc6a5938b528106c73ae8 /engines | |
| parent | e4745a0b20e6a61facc35f701466a76bf0ab7500 (diff) | |
| download | scummvm-rg350-e2d019f9d1048a35c7d6b862918e057218a5cab6.tar.gz scummvm-rg350-e2d019f9d1048a35c7d6b862918e057218a5cab6.tar.bz2 scummvm-rg350-e2d019f9d1048a35c7d6b862918e057218a5cab6.zip | |
LAB: Rename _lastMusicRoom to _curRoomMusic
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lab/music.cpp | 6 | ||||
| -rw-r--r-- | engines/lab/music.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index 4c889ca044..114179b310 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -57,7 +57,7 @@ Music::Music(LabEngine *vm) : _vm(vm) { _musicOn = false; _queuingAudioStream = nullptr; - _lastMusicRoom = 1; + _curRoomMusic = 1; } void Music::updateMusic() { @@ -212,7 +212,7 @@ void Music::setMusic(bool on) { } void Music::checkRoomMusic() { - if ((_lastMusicRoom == _vm->_roomNum) || !_musicOn) + if ((_curRoomMusic == _vm->_roomNum) || !_musicOn) return; if (_vm->_roomNum == CLOWNROOM) @@ -220,7 +220,7 @@ void Music::checkRoomMusic() { else if (_vm->_roomNum == DIMROOM) changeMusic("Music:Rm81"); - _lastMusicRoom = _vm->_roomNum; + _curRoomMusic = _vm->_roomNum; } void Music::changeMusic(const Common::String filename) { diff --git a/engines/lab/music.h b/engines/lab/music.h index 2cd87cd9a6..a25d965bfb 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -56,7 +56,7 @@ private: bool _musicPaused; bool _oldMusicOn; - uint16 _lastMusicRoom ; + uint16 _curRoomMusic ; uint32 _tLeftInFile; uint32 _leftInFile; |