aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scalpel
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-04 14:33:13 -0400
committerPaul Gilbert2015-07-04 14:33:13 -0400
commit88002ef19fbb5dd1f5465b6e282415e4ca3a138b (patch)
treea6c541206d66a7b6cfe8b70cb730a354cb334759 /engines/sherlock/scalpel
parent4025c20ea474d7978eb1c7267573f344a9b8830a (diff)
downloadscummvm-rg350-88002ef19fbb5dd1f5465b6e282415e4ca3a138b.tar.gz
scummvm-rg350-88002ef19fbb5dd1f5465b6e282415e4ca3a138b.tar.bz2
scummvm-rg350-88002ef19fbb5dd1f5465b6e282415e4ca3a138b.zip
SHERLOCK: Make playMusic a private method of Music
Diffstat (limited to 'engines/sherlock/scalpel')
-rw-r--r--engines/sherlock/scalpel/scalpel.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index 91e920d8f0..af9d613cce 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -279,7 +279,7 @@ bool ScalpelEngine::showCityCutscene() {
Common::fill(&greyPalette[0], &greyPalette[PALETTE_SIZE], 142);
_screen->fadeIn((const byte *)greyPalette, 3);
- _music->playMusic("prolog1");
+ _music->loadSong("prolog1");
_animation->_gfxLibraryFilename = "title.lib";
_animation->_soundLibraryFilename = "title.snd";
bool finished = _animation->play("26open1", true, 1, 255, true, 2);
@@ -391,7 +391,7 @@ bool ScalpelEngine::showCityCutscene() {
bool ScalpelEngine::showAlleyCutscene() {
byte palette[PALETTE_SIZE];
- _music->playMusic("prolog2");
+ _music->loadSong("prolog2");
_animation->_gfxLibraryFilename = "TITLE.LIB";
_animation->_soundLibraryFilename = "TITLE.SND";
@@ -470,7 +470,7 @@ bool ScalpelEngine::showStreetCutscene() {
_animation->_gfxLibraryFilename = "TITLE.LIB";
_animation->_soundLibraryFilename = "TITLE.SND";
- _music->playMusic("prolog3");
+ _music->loadSong("prolog3");
// wait a bit
bool finished = _events->delay(500);
@@ -501,7 +501,7 @@ bool ScalpelEngine::showStreetCutscene() {
}
bool ScalpelEngine::showOfficeCutscene() {
- _music->playMusic("prolog4");
+ _music->loadSong("prolog4");
_animation->_gfxLibraryFilename = "TITLE2.LIB";
_animation->_soundLibraryFilename = "TITLE.SND";
@@ -616,7 +616,7 @@ bool ScalpelEngine::showCityCutscene3DO() {
finished = _events->delay(2500, true);
// Play intro music
- _music->playMusic("prolog");
+ _music->loadSong("prolog");
// Fade screen to grey
_screen->_backBuffer1.fill(0xCE59); // RGB565: 25, 50, 25 (grey)