diff options
| author | Strangerke | 2015-05-24 01:20:42 +0200 |
|---|---|---|
| committer | Strangerke | 2015-05-24 01:20:42 +0200 |
| commit | 5407d996b448ab6b81fe19100a0b8f2728211487 (patch) | |
| tree | b69665cd21c12133cd7dc723b8fd746fadf369cf /engines/sherlock/scene.cpp | |
| parent | 1e58f3d9258ee6c98e48b3f246b922c786d1b14c (diff) | |
| download | scummvm-rg350-5407d996b448ab6b81fe19100a0b8f2728211487.tar.gz scummvm-rg350-5407d996b448ab6b81fe19100a0b8f2728211487.tar.bz2 scummvm-rg350-5407d996b448ab6b81fe19100a0b8f2728211487.zip | |
SHERLOCK: Split sound class in two, add WIP music player
Diffstat (limited to 'engines/sherlock/scene.cpp')
| -rw-r--r-- | engines/sherlock/scene.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 39ec16ca7e..781e596f40 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -167,7 +167,7 @@ void Scene::freeScene() { _vm->_talk->freeTalkVars(); _vm->_inventory->freeInv(); - _vm->_sound->freeSong(); + _vm->_music->freeSong(); _vm->_sound->freeLoadedSounds(); if (!_loadingSavedGame) @@ -197,6 +197,7 @@ bool Scene::loadScene(const Common::String &filename) { SaveManager &saves = *_vm->_saves; Screen &screen = *_vm->_screen; Sound &sound = *_vm->_sound; + Music &music = *_vm->_music; UserInterface &ui = *_vm->_ui; bool flag; @@ -446,8 +447,8 @@ bool Scene::loadScene(const Common::String &filename) { checkInventory(); // Handle starting any music for the scene - if (sound._musicOn && sound.loadSong(_currentScene)) - sound.startSong(); + if (music._musicOn && music.loadSong(_currentScene)) + music.startSong(); // Load walking images if not already loaded people.loadWalk(); |