diff options
| author | Paul Gilbert | 2015-07-01 22:36:38 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-07-01 22:36:38 -0400 |
| commit | 1b1643ad6f7f0c8cda743d92321dedf2c1373fda (patch) | |
| tree | f61b8873b42d719e1d3c145d1c547b8214eee8a6 /engines/sherlock/tattoo/tattoo_scene.cpp | |
| parent | 76419173b556a094828160dfe37b944bb10bf9c0 (diff) | |
| download | scummvm-rg350-1b1643ad6f7f0c8cda743d92321dedf2c1373fda.tar.gz scummvm-rg350-1b1643ad6f7f0c8cda743d92321dedf2c1373fda.tar.bz2 scummvm-rg350-1b1643ad6f7f0c8cda743d92321dedf2c1373fda.zip | |
SHERLOCK: RT: Implement cmdPlaySong opcode
Diffstat (limited to 'engines/sherlock/tattoo/tattoo_scene.cpp')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp index f19eb73a54..5803a0ace0 100644 --- a/engines/sherlock/tattoo/tattoo_scene.cpp +++ b/engines/sherlock/tattoo/tattoo_scene.cpp @@ -85,11 +85,11 @@ bool TattooScene::loadScene(const Common::String &filename) { // Handle loading music for the scene if (music._musicOn) { if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3) - sound._nextSongName = Common::String::format("res%02d", _currentScene); + music._nextSongName = Common::String::format("res%02d", _currentScene); // If it's a new song, then start it up - if (sound._currentSongName.compareToIgnoreCase(sound._nextSongName)) { - if (music.loadSong(sound._nextSongName)) { + if (music._currentSongName.compareToIgnoreCase(music._nextSongName)) { + if (music.loadSong(music._nextSongName)) { music.setMIDIVolume(music._musicVolume); if (music._musicOn) music.startSong(); |