diff options
| author | Paul Gilbert | 2015-10-17 14:08:44 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-10-17 14:08:44 -0400 |
| commit | c583294edeee8470c0ed965d8e7b357073f8560b (patch) | |
| tree | 9d026e0ce827e9837fd067929acb887a509a1923 | |
| parent | b8e3376099e21bb4029a48c8401fcd94355e3cb8 (diff) | |
| download | scummvm-rg350-c583294edeee8470c0ed965d8e7b357073f8560b.tar.gz scummvm-rg350-c583294edeee8470c0ed965d8e7b357073f8560b.tar.bz2 scummvm-rg350-c583294edeee8470c0ed965d8e7b357073f8560b.zip | |
SHERLOCK: RT: Fix setting new scene's music filename when music is off
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp index 96c7764a85..2f4e85299b 100644 --- a/engines/sherlock/tattoo/tattoo_scene.cpp +++ b/engines/sherlock/tattoo/tattoo_scene.cpp @@ -94,16 +94,14 @@ bool TattooScene::loadScene(const Common::String &filename) { setNPCPath(WATSON); // Handle loading music for the scene - if (music._musicOn) { - if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3) - music._nextSongName = Common::String::format("res%02d", _currentScene); - - // If it's a new song, then start it up - if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) { - if (music.loadSong(music._nextSongName)) { - if (music._musicOn) - music.startSong(); - } + if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3) + music._nextSongName = Common::String::format("res%02d", _currentScene); + + // If it's a new song, then start it up + if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) { + if (music.loadSong(music._nextSongName)) { + if (music._musicOn) + music.startSong(); } } |