aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index b2ffdfbacc..093f666a46 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