thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some corrections, based on observations from bug report #2284298 - "SAGA: Compiler warnings; possibly an engine bug"

Browse source 
svn-id: r35058
This commit is contained in:
Filippos Karapetis 2008-11-14 17:51:48 +00:00
parent 591d01b77f
commit 4294185c59
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/saga/animation.h
View file

@ -164,14 +164,17 @@ private:
void validateAnimationId(uint16 animId) { void validateAnimationId(uint16 animId) {
if (animId >= MAX_ANIMATIONS) { if (animId >= MAX_ANIMATIONS) {
// Cutaway
if (animId >= MAX_ANIMATIONS + ARRAYSIZE(_cutawayAnimations)) if (animId >= MAX_ANIMATIONS + ARRAYSIZE(_cutawayAnimations))
error("validateAnimationId: animId out of range"); error("validateAnimationId: animId out of range");
if (_cutawayAnimations[animId - MAX_ANIMATIONS] == NULL) { if (_cutawayAnimations[animId - MAX_ANIMATIONS] == NULL) {
error("validateAnimationId: animId=%i unassigned", animId); error("validateAnimationId: animId=%i unassigned", animId);
} }
} } else {
if (_animations[animId] == NULL) { // Animation
error("validateAnimationId: animId=%i unassigned.", animId); if (_animations[animId] == NULL) {
error("validateAnimationId: animId=%i unassigned.", animId);
}
} }
} }
@ -184,7 +187,7 @@ private:
AnimationData* getAnimation(uint16 animId) { AnimationData* getAnimation(uint16 animId) {
validateAnimationId(animId); validateAnimationId(animId);
if (animId > MAX_ANIMATIONS) if (animId >= MAX_ANIMATIONS)
return _cutawayAnimations[animId - MAX_ANIMATIONS]; return _cutawayAnimations[animId - MAX_ANIMATIONS];
return _animations[animId]; return _animations[animId];
} }