aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/music.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2015-06-08 20:29:22 +0200
committerMartin Kiewitz2015-06-08 20:29:22 +0200
commit91d4b8df0fb9238d7b480f3f925703f55cbb871e (patch)
tree4808485ae9ccb429fda63b43b1dbc56860dd5795 /engines/sherlock/music.cpp
parentdc1706700be6e3c10d5db6938109221ec04df7d3 (diff)
downloadscummvm-rg350-91d4b8df0fb9238d7b480f3f925703f55cbb871e.tar.gz
scummvm-rg350-91d4b8df0fb9238d7b480f3f925703f55cbb871e.tar.bz2
scummvm-rg350-91d4b8df0fb9238d7b480f3f925703f55cbb871e.zip
SHERLOCK: adjust music play code (file extension)
Diffstat (limited to 'engines/sherlock/music.cpp')
-rw-r--r--engines/sherlock/music.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 8b1f173f3d..346d087a1e 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -295,7 +295,7 @@ bool Music::loadSong(int songNumber) {
if((songNumber > NUM_SONGS) || (songNumber < 1))
return false;
- Common::String songName = Common::String(SONG_NAMES[songNumber - 1]) + ".MUS";
+ Common::String songName = Common::String(SONG_NAMES[songNumber - 1]);
freeSong(); // free any song that is currently loaded
@@ -327,7 +327,8 @@ bool Music::playMusic(const Common::String &name) {
if (!_midiDriver)
return false;
- Common::SeekableReadStream *stream = _vm->_res->load(name, "MUSIC.LIB");
+ Common::String midiMusicName = name + ".MUS";
+ Common::SeekableReadStream *stream = _vm->_res->load(midiMusicName, "MUSIC.LIB");
byte *data = new byte[stream->size()];
int32 dataSize = stream->size();