[Scummvm-cvs-logs] scummvm master -> 92b087d2362f6b1679fa9813386f5071b7bb50bb

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
92b087d236 SHERLOCK: RT: Fix redundant extra wait after talking to LLoyd Jones


Commit: 92b087d2362f6b1679fa9813386f5071b7bb50bb
    https://github.com/scummvm/scummvm/commit/92b087d2362f6b1679fa9813386f5071b7bb50bb
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-29T07:03:20-04:00

Commit Message:
SHERLOCK: RT: Fix redundant extra wait after talking to LLoyd Jones

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index a5c5bc8..1b1a7cc 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;