diff options
author | Paul Gilbert | 2015-05-30 10:46:19 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-05-30 10:46:19 -0400 |
commit | 6b95fc6b1132cf5ce6edc4216368bd38eddc939b (patch) | |
tree | 45f0d9fa5e65ae9f42fefb301498c2dd704bf772 /engines/sherlock/music.cpp | |
parent | c3712f9a73eb7511c2a5bea20aa61ea21d3258f4 (diff) | |
parent | 895189e3ffd1931ca01991731f98bbf74796e05d (diff) | |
download | scummvm-rg350-6b95fc6b1132cf5ce6edc4216368bd38eddc939b.tar.gz scummvm-rg350-6b95fc6b1132cf5ce6edc4216368bd38eddc939b.tar.bz2 scummvm-rg350-6b95fc6b1132cf5ce6edc4216368bd38eddc939b.zip |
Merge branch 'sherlock2'
Diffstat (limited to 'engines/sherlock/music.cpp')
-rw-r--r-- | engines/sherlock/music.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index ed047f61f8..3e31bcc83d 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -272,6 +272,11 @@ bool Music::loadSong(int songNumber) { return true; } +bool Music::loadSong(const Common::String &songName) { + warning("TODO: Music::loadSong"); + return false; +} + void Music::syncMusicSettings() { _musicOn = !ConfMan.getBool("mute") && !ConfMan.getBool("music_mute"); } |