aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scene.cpp
diff options
context:
space:
mode:
authorStrangerke2015-05-22 22:23:40 +0200
committerStrangerke2015-05-22 22:23:40 +0200
commit1e58f3d9258ee6c98e48b3f246b922c786d1b14c (patch)
treea3c14885e5147ef049afd268de336e1cde3f1c15 /engines/sherlock/scene.cpp
parent2db07a9d39cc9557d292908d84d3fc146635fd75 (diff)
downloadscummvm-rg350-1e58f3d9258ee6c98e48b3f246b922c786d1b14c.tar.gz
scummvm-rg350-1e58f3d9258ee6c98e48b3f246b922c786d1b14c.tar.bz2
scummvm-rg350-1e58f3d9258ee6c98e48b3f246b922c786d1b14c.zip
SHERLOCK: Rework use of music flags
Diffstat (limited to 'engines/sherlock/scene.cpp')
-rw-r--r--engines/sherlock/scene.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp
index 5ae7e25258..39ec16ca7e 100644
--- a/engines/sherlock/scene.cpp
+++ b/engines/sherlock/scene.cpp
@@ -446,10 +446,8 @@ bool Scene::loadScene(const Common::String &filename) {
checkInventory();
// Handle starting any music for the scene
- if (sound._musicOn && sound.loadSong(_currentScene)) {
- if (sound._music)
- sound.startSong();
- }
+ if (sound._musicOn && sound.loadSong(_currentScene))
+ sound.startSong();
// Load walking images if not already loaded
people.loadWalk();