aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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();
+ }
}
}