diff options
Diffstat (limited to 'engines/saga/animation.h')
| -rw-r--r-- | engines/saga/animation.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/saga/animation.h b/engines/saga/animation.h index d688b0f0a7..a88d743af1 100644 --- a/engines/saga/animation.h +++ b/engines/saga/animation.h @@ -166,9 +166,11 @@ private: if (animId >= MAX_ANIMATIONS) { if (animId >= MAX_ANIMATIONS + ARRAYSIZE(_cutawayAnimations)) error("validateAnimationId: animId out of range"); - if (_cutawayAnimations[animId - MAX_ANIMATIONS] == NULL) + if (_cutawayAnimations[animId - MAX_ANIMATIONS] == NULL) { error("validateAnimationId: animId=%i unassigned", animId); - } else if (_animations[animId] == NULL) { + } + } + if (_animations[animId] == NULL) { error("validateAnimationId: animId=%i unassigned.", animId); } } @@ -182,7 +184,7 @@ private: AnimationData* getAnimation(uint16 animId) { validateAnimationId(animId); - if (animId >= MAX_ANIMATIONS) + if (animId > MAX_ANIMATIONS) return _cutawayAnimations[animId - MAX_ANIMATIONS]; return _animations[animId]; } |