[Scummvm-cvs-logs] scummvm master -> e90c04b14f870ca6d36029b2e0769ab8e77f29b8

[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:
e90c04b14f SHERLOCK: Fix Scalpel bug when picking up paper


Commit: e90c04b14f870ca6d36029b2e0769ab8e77f29b8
    https://github.com/scummvm/scummvm/commit/e90c04b14f870ca6d36029b2e0769ab8e77f29b8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-06-07T18:24:43-04:00

Commit Message:
SHERLOCK: Fix Scalpel bug when picking up paper

Changed paths:
    engines/sherlock/objects.cpp



diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index bdb5543..a360f9a 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -260,7 +260,8 @@ void Sprite::adjustSprite() {
 	if (!map._active || (map._frameChangeFlag = !map._frameChangeFlag))
 		++_frameNumber;
 
-	if (_walkSequences[_sequenceNumber][_frameNumber] == 0) {
+	if (_frameNumber >= _walkSequences[_sequenceNumber]._sequences.size() ||
+			_walkSequences[_sequenceNumber][_frameNumber] == 0) {
 		switch (_sequenceNumber) {
 		case Scalpel::STOP_UP:
 		case Scalpel::STOP_DOWN: