[Scummvm-cvs-logs] scummvm master -> 68499c79c4831d6f4f3f61a9bf117a891a50cd4f

[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:
68499c79c4 SHERLOCK: RT: Fix hasAborts to return correct results


Commit: 68499c79c4831d6f4f3f61a9bf117a891a50cd4f
    https://github.com/scummvm/scummvm/commit/68499c79c4831d6f4f3f61a9bf117a891a50cd4f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-15T10:15:35-04:00

Commit Message:
SHERLOCK: RT: Fix hasAborts to return correct results

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index a2210cc..d97d312 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -105,14 +105,14 @@ bool BaseObject::hasAborts() const {
 		// If we've started checking and we've encountered another Talk or Listen Sequence Code,
 		// then we're done checking this sequence because this is where it would repeat
 		if (startChecking && (v == TALK_SEQ_CODE || v == TALK_LISTEN_CODE))
-			return false;
+			break;
 
 		// See if we've found the beginning of a Talk Sequence
 		if ((v == TALK_SEQ_CODE && seqNum < 128) || (v == TALK_LISTEN_CODE && seqNum >= 128)) {
 			// If checking was already on and we came across one of these codes, then there couldn't
 			// have been an Allow Talk Interrupt code in the sequence we were checking, so we're done.
 			if (startChecking)
-				return false;
+				break;
 
 			seqNum--;
 			// See if we're at the correct Talk Sequence Number
@@ -133,7 +133,7 @@ bool BaseObject::hasAborts() const {
 		}
 	} while (idx < _seqSize);
 
-	return true;
+	return false;
 }
 
 void BaseObject::checkObject() {