diff options
author | Paul Gilbert | 2015-06-11 08:32:31 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-11 08:32:31 -0400 |
commit | 40a3a3b8353924b7bec4237d622e6ddddaf2aef8 (patch) | |
tree | cc52d4742d91bf3a59971861e4bdd263c01724e5 /engines/sherlock/scene.cpp | |
parent | 252b4d13171093ec90289e887bab891f591fe59c (diff) | |
download | scummvm-rg350-40a3a3b8353924b7bec4237d622e6ddddaf2aef8.tar.gz scummvm-rg350-40a3a3b8353924b7bec4237d622e6ddddaf2aef8.tar.bz2 scummvm-rg350-40a3a3b8353924b7bec4237d622e6ddddaf2aef8.zip |
SHERLOCK: RT map display partially working
Diffstat (limited to 'engines/sherlock/scene.cpp')
-rw-r--r-- | engines/sherlock/scene.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/engines/sherlock/scene.cpp b/engines/sherlock/scene.cpp index 9100d58e13..c16d1f208b 100644 --- a/engines/sherlock/scene.cpp +++ b/engines/sherlock/scene.cpp @@ -266,8 +266,6 @@ bool Scene::loadScene(const Common::String &filename) { Resources &res = *_vm->_res; SaveManager &saves = *_vm->_saves; Screen &screen = *_vm->_screen; - Sound &sound = *_vm->_sound; - Talk &talk = *_vm->_talk; UserInterface &ui = *_vm->_ui; bool flag; @@ -283,36 +281,6 @@ bool Scene::loadScene(const Common::String &filename) { _cAnim.clear(); _sequenceBuffer.clear(); - // Check if it's a scene we need to keep trakc track of how many times we've visited - for (int idx = (int)_sceneTripCounters.size() - 1; idx >= 0; --idx) { - if (_sceneTripCounters[idx]._sceneNumber == _currentScene) { - if (--_sceneTripCounters[idx]._numTimes == 0) { - _vm->setFlags(_sceneTripCounters[idx]._flag); - _sceneTripCounters.remove_at(idx); - } - } - } - - if (IS_ROSE_TATTOO) { - // Set the NPC paths for the scene - setNPCPath(0); - - // Handle loading music for the scene - if (sound._midiDrvLoaded) { - if (talk._scriptMoreFlag != 1 && talk._scriptMoreFlag != 3) - sound._nextSongName = Common::String::format("res%02d", _currentScene); - - // If it's a new song, then start it up - if (sound._currentSongName.compareToIgnoreCase(sound._nextSongName)) { - if (music.loadSong(sound._nextSongName)) { - sound.setMIDIVolume(sound._musicVolume); - if (music._musicOn) - music.startSong(); - } - } - } - } - // // Load the room resource file for the scene // |