thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Rework use of music flags

Browse source
This commit is contained in:
Strangerke 2015-05-22 22:23:40 +02:00
parent 2db07a9d39
commit 1e58f3d925
6 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/sherlock/scalpel/scalpel.cpp
View file

@ -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: