aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-07-05 22:22:30 -0400
committerPaul Gilbert2015-07-05 22:22:30 -0400
commitef492b351b5762f24de2762de21360f16e93e98f (patch)
treee669ccb8ea131ed187986b98e07034ddfccf2c50
parent023084f7e7d4005eaa5f74bbca53becf423e9ee6 (diff)
downloadscummvm-rg350-ef492b351b5762f24de2762de21360f16e93e98f.tar.gz
scummvm-rg350-ef492b351b5762f24de2762de21360f16e93e98f.tar.bz2
scummvm-rg350-ef492b351b5762f24de2762de21360f16e93e98f.zip
SHERLOCK: RT: Changes for doScript method ending code
-rw-r--r--engines/sherlock/sherlock.cpp1
-rw-r--r--engines/sherlock/talk.cpp8
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp
index 6e2ed44eea..7653dc0083 100644
--- a/engines/sherlock/sherlock.cpp
+++ b/engines/sherlock/sherlock.cpp
@@ -188,7 +188,6 @@ void SherlockEngine::sceneLoop() {
_scene->freeScene();
_people->freeWalk();
-
}
void SherlockEngine::handleInput() {
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index ffc55db121..c350560407 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -879,11 +879,13 @@ void Talk::doScript(const Common::String &script) {
}
pullSequence();
- if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
- people.clearTalking();
- if (IS_ROSE_TATTOO)
+ if (IS_SERRATED_SCALPEL) {
+ if (_speaker >= 0 && _speaker < SPEAKER_REMOVE)
+ people.clearTalking();
+ } else {
static_cast<Tattoo::TattooPeople *>(_vm->_people)->pullNPCPaths();
+ }
}
}