From e90c04b14f870ca6d36029b2e0769ab8e77f29b8 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 7 Jun 2015 18:24:43 -0400
Subject: SHERLOCK: Fix Scalpel bug when picking up paper

---
 engines/sherlock/objects.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines')

diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index bdb554330a..a360f9abf9 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:
-- 
cgit v1.2.3