mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-13 16:16:08 +00:00
Code Issues Releases Wiki Activity

Fix crash when AnimationLayer is missing

Browse source
This commit is contained in:
fgenesis 2014-05-16 00:04:56 +02:00
parent 18034bcc18
commit b98e2532ed
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
BBGE/SkeletalSprite.cpp
View file

@ -1694,18 +1694,15 @@ void SkeletalSprite::loadSkeletal(const std::string &fn)
Animation *SkeletalSprite::getCurrentAnimation(int layer)
{
return animLayers[layer].getCurrentAnimation();
return layer < animLayers.size() ? animLayers[layer].getCurrentAnimation() : NULL;
}
void SkeletalSprite::setTime(float time, int layer)
{
if(layer < animLayers.size())
animLayers[layer].timer = time;
}
// hack:
// calculate based on frames
const int lerpAvg = 3;
void AnimationLayer::updateBones()
{
if (!animating && !(&s->animLayers[0] == this) && fallThru == 0) return;