[Scummvm-cvs-logs] SF.net SVN: scummvm:[35057] scummvm/trunk/engines/saga/animation.h

[eriktorbjorn at users.sourceforge.net]

Revision: 35057
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35057&view=rev
Author:   eriktorbjorn
Date:     2008-11-14 14:12:18 +0000 (Fri, 14 Nov 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/animation.h

Modified: scummvm/trunk/engines/saga/animation.h
===================================================================
--- scummvm/trunk/engines/saga/animation.h	2008-11-14 14:03:08 UTC (rev 35056)
+++ scummvm/trunk/engines/saga/animation.h	2008-11-14 14:12:18 UTC (rev 35057)
@@ -166,9 +166,11 @@
 		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 @@
 
 	AnimationData* getAnimation(uint16 animId) {
 		validateAnimationId(animId);
-		if (animId >= MAX_ANIMATIONS)
+		if (animId > MAX_ANIMATIONS)
 			return _cutawayAnimations[animId - MAX_ANIMATIONS];
 		return _animations[animId];
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.