[Scummvm-cvs-logs] scummvm master -> 47a04b09aebfadb5190e785482db6d3bf700d28b

dreammaster dreammaster at scummvm.org
Thu Aug 20 04:06:26 CEST 2015


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:
47a04b09ae SHERLOCK: RT: Fix resetting sequence on objects with hasAborts


Commit: 47a04b09aebfadb5190e785482db6d3bf700d28b
    https://github.com/scummvm/scummvm/commit/47a04b09aebfadb5190e785482db6d3bf700d28b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-19T22:05:52-04:00

Commit Message:
SHERLOCK: RT: Fix resetting sequence on objects with hasAborts

Changed paths:
    engines/sherlock/tattoo/tattoo_talk.cpp



diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index c7a9709..a341115 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -934,7 +934,7 @@ void TattooTalk::pullSequence(int slot) {
 			Object &o = *seq._obj;
 			
 			// See if we're not supposed to restore it until an Allow Talk Interrupt
-			if (seq._obj->hasAborts()) {
+			if (slot == -1 && seq._obj->hasAborts()) {
 				seq._obj->_gotoSeq = -1;
 				seq._obj->_restoreSlot = idx;
 			} else {






More information about the Scummvm-git-logs mailing list