[Scummvm-cvs-logs] scummvm master -> 2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83

dreammaster dreammaster at scummvm.org
Sun Aug 30 03:38:38 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:
2c28a1e12d SHERLOCK: RT: Fix crash visiting Lawton's house after he's fled


Commit: 2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83
    https://github.com/scummvm/scummvm/commit/2c28a1e12d5d4cdfbf585a2d9995f9879e3e7c83
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-29T21:38:08-04:00

Commit Message:
SHERLOCK: RT: Fix crash visiting Lawton's house after he's fled

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index b2ffdfb..093f666 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -350,10 +350,10 @@ bool BaseObject::checkEndOfSequence() {
 	if (_type == REMOVE || _type == INVALID)
 		return false;
 
-	if (_sequences[_frameNumber] == 0 || _frameNumber >= checkFrame) {
+	if (_frameNumber < 0 || _frameNumber >= checkFrame || _sequences[_frameNumber] == 0) {
 		result = true;
 
-		if (_frameNumber >= (checkFrame - 1)) {
+		if (_frameNumber < 0 || _frameNumber >= (checkFrame - 1)) {
 			_frameNumber = START_FRAME;
 		}  else {
 			// Determine next sequence to use






More information about the Scummvm-git-logs mailing list