diff options
Diffstat (limited to 'engines/lab/labmusic.cpp')
| -rw-r--r-- | engines/lab/labmusic.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/lab/labmusic.cpp b/engines/lab/labmusic.cpp index fe2d6e973c..d4752c60da 100644 --- a/engines/lab/labmusic.cpp +++ b/engines/lab/labmusic.cpp @@ -262,11 +262,11 @@ void Music::checkRoomMusic() { return; if (RoomNum == CLOWNROOM) - g_music->changeMusic("Music:Laugh"); + changeMusic("Music:Laugh"); else if (RoomNum == DIMROOM) - g_music->changeMusic("Music:Rm81"); + changeMusic("Music:Rm81"); else if (_doReset) - g_music->resetMusic(); + resetMusic(); _lastMusicRoom = RoomNum; } @@ -349,12 +349,9 @@ byte **Music::newOpen(const char *name, uint32 &size) { if (file = isBuffered(name)) return file; - if (_musicOn) { - updateMusic(); - updateMusic(); - } + updateMusic(); - if (!_doNotFilestopSoundEffect && isSoundEffectActive()) + if (!_doNotFilestopSoundEffect) stopSoundEffect(); file = openFile(name, size); |