From 98c10803f79ce9decb4a431719e18bb27aac4485 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 3 Jun 2012 20:06:08 +0300
Subject: Improve a bit animation speed.

---
 src/animatedsprite.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/animatedsprite.cpp')

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 9bf7018a3..1014fbe46 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -85,7 +85,7 @@ bool AnimatedSprite::reset()
     mLastTime = 0;
 
     if (mAnimation)
-        mFrame = mAnimation->getFrame(0);
+        mFrame = &mAnimation->mFrames[0];
     else
         mFrame = nullptr;
     return ret;
@@ -142,7 +142,8 @@ bool AnimatedSprite::update(int time)
 
 bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
 {
-    if (!mFrame || !mAnimation || Animation::isTerminator(*mFrame))
+    // move code from Animation::isTerminator(*mFrame)
+    if (!mFrame || !mAnimation || (!mFrame->image && mFrame->type == Frame::ANIMATION))
         return false;
 
     mFrameTime += time;
@@ -158,7 +159,7 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
         if (mFrameIndex >= mAnimation->getLength())
             mFrameIndex = 0;
 
-        mFrame = mAnimation->getFrame(mFrameIndex);
+        mFrame = &mAnimation->mFrames[mFrameIndex];
         if (!mFrame || (mFrame->type == Frame::LABEL
             && !mFrame->nextAction.empty()))
         {
@@ -170,7 +171,7 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
             {
                 for (unsigned i = 0; i < mAnimation->getLength(); i ++)
                 {
-                    Frame *frame = mAnimation->getFrame(i);
+                    Frame *frame = &mAnimation->mFrames[i];
                     if (frame->type == Frame::LABEL
                         && mFrame->nextAction == frame->nextAction)
                     {
@@ -179,7 +180,7 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
                         if (mFrameIndex >= mAnimation->getLength())
                             mFrameIndex = 0;
 
-                        mFrame = mAnimation->getFrame(mFrameIndex);
+                        mFrame = &mAnimation->mFrames[mFrameIndex];
 
                         fail = true;
                         break;
@@ -195,7 +196,8 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
                 return true;
             }
         }
-        else if (Animation::isTerminator(*mFrame))
+        // copy code from Animation::isTerminator(*mFrame)
+        else if (!mFrame->image && mFrame->type == Frame::ANIMATION)
         {
             if (mFrame->rand == 100 || rand() % 100 <= mFrame->rand)
             {
-- 
cgit v1.2.3-60-g2f50