diff options
| author | Martin Kiewitz | 2015-06-08 20:29:22 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-06-08 20:29:22 +0200 |
| commit | 91d4b8df0fb9238d7b480f3f925703f55cbb871e (patch) | |
| tree | 4808485ae9ccb429fda63b43b1dbc56860dd5795 | |
| parent | dc1706700be6e3c10d5db6938109221ec04df7d3 (diff) | |
| download | scummvm-rg350-91d4b8df0fb9238d7b480f3f925703f55cbb871e.tar.gz scummvm-rg350-91d4b8df0fb9238d7b480f3f925703f55cbb871e.tar.bz2 scummvm-rg350-91d4b8df0fb9238d7b480f3f925703f55cbb871e.zip | |
SHERLOCK: adjust music play code (file extension)
| -rw-r--r-- | engines/sherlock/music.cpp | 5 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 8 |
2 files changed, 7 insertions, 6 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(); diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index ec0e397887..9ace683fbe 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -277,7 +277,7 @@ bool ScalpelEngine::showCityCutscene() { Common::fill(&greyPalette[0], &greyPalette[PALETTE_SIZE], 142); _screen->fadeIn((const byte *)greyPalette, 3); - _music->playMusic("prolog1.mus"); + _music->playMusic("prolog1"); _animation->_gfxLibraryFilename = "title.lib"; _animation->_soundLibraryFilename = "title.snd"; bool finished = _animation->play("26open1", true, 1, 255, true, 2); @@ -350,7 +350,7 @@ bool ScalpelEngine::showCityCutscene() { bool ScalpelEngine::showAlleyCutscene() { byte palette[PALETTE_SIZE]; - _music->playMusic("prolog2.mus"); + _music->playMusic("prolog2"); _animation->_gfxLibraryFilename = "TITLE.LIB"; _animation->_soundLibraryFilename = "TITLE.SND"; @@ -416,7 +416,7 @@ bool ScalpelEngine::showStreetCutscene() { _animation->_gfxLibraryFilename = "TITLE.LIB"; _animation->_soundLibraryFilename = "TITLE.SND"; - _music->playMusic("PROLOG3.MUS"); + _music->playMusic("prolog3"); // wait a bit bool finished = _events->delay(500); @@ -483,7 +483,7 @@ bool ScalpelEngine::scrollCredits() { } bool ScalpelEngine::showOfficeCutscene() { - _music->playMusic("PROLOG4.MUS"); + _music->playMusic("prolog4"); _animation->_gfxLibraryFilename = "TITLE2.LIB"; _animation->_soundLibraryFilename = "TITLE.SND"; |