diff options
| author | Strangerke | 2015-05-22 22:23:40 +0200 |
|---|---|---|
| committer | Strangerke | 2015-05-22 22:23:40 +0200 |
| commit | 1e58f3d9258ee6c98e48b3f246b922c786d1b14c (patch) | |
| tree | a3c14885e5147ef049afd268de336e1cde3f1c15 /engines/sherlock/scalpel/scalpel.cpp | |
| parent | 2db07a9d39cc9557d292908d84d3fc146635fd75 (diff) | |
| download | scummvm-rg350-1e58f3d9258ee6c98e48b3f246b922c786d1b14c.tar.gz scummvm-rg350-1e58f3d9258ee6c98e48b3f246b922c786d1b14c.tar.bz2 scummvm-rg350-1e58f3d9258ee6c98e48b3f246b922c786d1b14c.zip | |
SHERLOCK: Rework use of music flags
Diffstat (limited to 'engines/sherlock/scalpel/scalpel.cpp')
| -rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index 7875f22c47..8354b22c2a 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -668,12 +668,8 @@ void ScalpelEngine::showLBV(const Common::String &filename) { void ScalpelEngine::startScene() { if (_scene->_goToScene == OVERHEAD_MAP || _scene->_goToScene == OVERHEAD_MAP2) { // Show the map - if (_sound->_musicOn) { - if (_sound->loadSong(100)) { - if (_sound->_music) - _sound->startSong(); - } - } + if (_sound->_musicOn && _sound->loadSong(100)) + _sound->startSong(); _scene->_goToScene = _map->show(); @@ -693,10 +689,8 @@ void ScalpelEngine::startScene() { case RESCUE_ANNA: case MOOREHEAD_DEATH: case BRUMWELL_SUICIDE: - if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene)) { - if (_sound->_music) - _sound->startSong(); - } + if (_sound->_musicOn && _sound->loadSong(_scene->_goToScene)) + _sound->startSong(); switch (_scene->_goToScene) { case BLACKWOOD_CAPTURE: |