[Scummvm-cvs-logs] scummvm master -> 1aba10f9521ab11efe5da711831b137c00625de5

[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:
1aba10f952 SHERLOCK: RT: Fix hang on ALLOW_TALK_CODE sequence code


Commit: 1aba10f9521ab11efe5da711831b137c00625de5
    https://github.com/scummvm/scummvm/commit/1aba10f9521ab11efe5da711831b137c00625de5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-17T19:08:15-04:00

Commit Message:
SHERLOCK: RT: Fix hang on ALLOW_TALK_CODE sequence code

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index c89915f..b412724 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -180,6 +180,7 @@ void BaseObject::checkObject() {
 			if (IS_ROSE_TATTOO && v == ALLOW_TALK_CODE) {
 				if (_gotoSeq) {
 					setObjTalkSequence(_gotoSeq);
+					_gotoSeq = 0;
 				} else {
 					++_frameNumber;
 				}