diff options
| author | Torbjörn Andersson | 2008-11-14 14:12:18 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2008-11-14 14:12:18 +0000 |
| commit | 591d01b77f59dea2ba7508c0731e9b962c0eee07 (patch) | |
| tree | 9edccfc88abf45db8de62731bdca49111737e0c3 /engines/saga/animation.h | |
| parent | 5e5eebf24f1951de4300e4c7d642fd5e6fbb5936 (diff) | |
| download | scummvm-rg350-591d01b77f59dea2ba7508c0731e9b962c0eee07.tar.gz scummvm-rg350-591d01b77f59dea2ba7508c0731e9b962c0eee07.tar.bz2 scummvm-rg350-591d01b77f59dea2ba7508c0731e9b962c0eee07.zip | |
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
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]; } |