From 6b92b52308211bc61320e3c8062c59e7b4e81f65 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 27 May 2012 14:24:31 +0300 Subject: Fix incorrect reset animation. --- src/animatedsprite.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp index 136bea946..9bf7018a3 100644 --- a/src/animatedsprite.cpp +++ b/src/animatedsprite.cpp @@ -84,6 +84,10 @@ bool AnimatedSprite::reset() mFrameTime = 0; mLastTime = 0; + if (mAnimation) + mFrame = mAnimation->getFrame(0); + else + mFrame = nullptr; return ret; } @@ -102,8 +106,6 @@ bool AnimatedSprite::play(std::string spriteAction) if (animation && animation != mAnimation && animation->getLength() > 0) { mAnimation = animation; - mFrame = mAnimation->getFrame(0); - reset(); return true; @@ -252,7 +254,6 @@ bool AnimatedSprite::setSpriteDirection(SpriteDirection direction) if (animation && animation != mAnimation && animation->getLength() > 0) { mAnimation = animation; - mFrame = mAnimation->getFrame(0); reset(); } -- cgit v1.2.3-60-g2f50