From 92b087d2362f6b1679fa9813386f5071b7bb50bb Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 29 Aug 2015 07:03:20 -0400
Subject: SHERLOCK: RT: Fix redundant extra wait after talking to LLoyd Jones

---
 engines/sherlock/talk.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/sherlock/talk.cpp')

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;
-- 
cgit v1.2.3