diff options
| author | Paul Gilbert | 2015-08-29 07:03:20 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-08-29 07:03:20 -0400 |
| commit | 92b087d2362f6b1679fa9813386f5071b7bb50bb (patch) | |
| tree | 05a19a8bbf055460677a5349c910b1b3e55277e6 /engines/sherlock/talk.cpp | |
| parent | fefd46c60c94c20261d910e22de767fba3dcbcc7 (diff) | |
| download | scummvm-rg350-92b087d2362f6b1679fa9813386f5071b7bb50bb.tar.gz scummvm-rg350-92b087d2362f6b1679fa9813386f5071b7bb50bb.tar.bz2 scummvm-rg350-92b087d2362f6b1679fa9813386f5071b7bb50bb.zip | |
SHERLOCK: RT: Fix redundant extra wait after talking to LLoyd Jones
Diffstat (limited to 'engines/sherlock/talk.cpp')
| -rw-r--r-- | engines/sherlock/talk.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp index a5c5bc8944..1b1a7cce3c 100644 --- a/engines/sherlock/talk.cpp +++ b/engines/sherlock/talk.cpp @@ -1089,7 +1089,9 @@ OpcodeReturn Talk::cmdRunCAnimation(const byte *&str) { return RET_EXIT; // Check if next character is changing side or changing portrait - if (_charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION])) + _wait = 0; + if (_charCount && (str[1] == _opcodes[OP_SWITCH_SPEAKER] || + (IS_SERRATED_SCALPEL && str[1] == _opcodes[OP_ASSIGN_PORTRAIT_LOCATION]))) _wait = 1; return RET_SUCCESS; |