diff options
| author | Paul Gilbert | 2015-06-14 10:57:05 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-06-14 10:57:05 -0400 |
| commit | b26bc296194c3a745fa9d222862ce1ad12a13e3e (patch) | |
| tree | 6d90bfc1a0084d42d1f97eacd6e8344d173d16c0 /engines/sherlock/talk.cpp | |
| parent | be5df8e30455b45e20dff36c899ce18184544ed1 (diff) | |
| download | scummvm-rg350-b26bc296194c3a745fa9d222862ce1ad12a13e3e.tar.gz scummvm-rg350-b26bc296194c3a745fa9d222862ce1ad12a13e3e.tar.bz2 scummvm-rg350-b26bc296194c3a745fa9d222862ce1ad12a13e3e.zip | |
SHERLOCK: RT: Fix player animation when enterng scene
Diffstat (limited to 'engines/sherlock/talk.cpp')
| -rw-r--r-- | engines/sherlock/talk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index c800881da8..a349d7193d 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -170,9 +170,9 @@ void Talk::talkTo(const Common::String &filename) { // Turn on the Exit option ui._endKeyActive = true; - if (people[HOLMES]._walkCount || people[HOLMES]._walkTo.size() > 0) { - // Only interrupt if an action if trying to do an action, and not just - // if the player is walking around the scene + if (people[HOLMES]._walkCount || (people[HOLMES]._walkTo.size() > 0 && + (IS_SERRATED_SCALPEL || people._allowWalkAbort))) { + // Only interrupt if trying to do an action, and not just if player is walking around the scene if (people._allowWalkAbort) abortFlag = true; |