diff options
| author | Filippos Karapetis | 2016-01-14 00:31:37 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2016-01-14 23:41:28 +0200 |
| commit | 7aafcaca1a5df7e63795e0e6e72f06452490992e (patch) | |
| tree | 24a818e8cb5824ed5e22b547265f74ff5aaeef22 /engines/lab/music.cpp | |
| parent | 49a45a21cee8957853cd35e7ffd02fd29bb294a3 (diff) | |
| download | scummvm-rg350-7aafcaca1a5df7e63795e0e6e72f06452490992e.tar.gz scummvm-rg350-7aafcaca1a5df7e63795e0e6e72f06452490992e.tar.bz2 scummvm-rg350-7aafcaca1a5df7e63795e0e6e72f06452490992e.zip | |
LAB: Move music reset code into a separate function
Diffstat (limited to 'engines/lab/music.cpp')
| -rw-r--r-- | engines/lab/music.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp index 8045c51044..9f9d8eab8f 100644 --- a/engines/lab/music.cpp +++ b/engines/lab/music.cpp @@ -104,16 +104,12 @@ void Music::checkRoomMusic() { if ((_curRoomMusic == _vm->_roomNum) || !_musicFile) return; - if (_vm->_roomNum == CLOWNROOM) { + if (_vm->_roomNum == CLOWNROOM) changeMusic("Music:Laugh", true, false); - } else if (_vm->_roomNum == DIMROOM) { + else if (_vm->_roomNum == DIMROOM) changeMusic("Music:Rm81", true, false); - } else if (_curRoomMusic == CLOWNROOM || _curRoomMusic == DIMROOM) { - if (_vm->getPlatform() != Common::kPlatformAmiga) - changeMusic("Music:Backgrou", false, true); - else - changeMusic("Music:Background", false, true); - } + else if (_curRoomMusic == CLOWNROOM || _curRoomMusic == DIMROOM) + resetMusic(true); _curRoomMusic = _vm->_roomNum; } @@ -175,4 +171,11 @@ void Music::readSound(bool waitTillFinished, bool loop, Common::File *file) { } } +void Music::resetMusic(bool seektoStoredPos) { + if (_vm->getPlatform() != Common::kPlatformAmiga) + changeMusic("Music:BackGrou", false, seektoStoredPos); + else + changeMusic("Music:BackGround", false, seektoStoredPos); +} + } // End of namespace Lab |