From 591d01b77f59dea2ba7508c0731e9b962c0eee07 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Fri, 14 Nov 2008 14:12:18 +0000
Subject: Reverted change I accidentally made to the SAGA engine when
 committing the SCUMM charset changes. It may be a correct change, but it's
 not yet ready.

svn-id: r35057
---
 engines/saga/animation.h | 8 +++++---
 1 file 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];
 	}
-- 
cgit v1.2.3