Fixed a regression on the particle engine caused by modifying the

SimpleAnimation class to use correct delays for target drawing.
Basically, because the SimpleAnimation was a bit more restrictive on
ensuring that frame rates were being respected, some particles would not
get drawn. This commit allows for target animations to look correct,
while not breaking particles.

Signed-off-by: Ira Rice <irarice@gmail.com>

2 files changed, 0 insertions, 11 deletions

diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index ab50674b..c3584ede 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -132,14 +132,6 @@ void SimpleAnimation::reset()
 
 void SimpleAnimation::update(unsigned int timePassed)
 {
-    // Avoid freaking out at first frame or when tick_time overflows
-    if (timePassed < mLastTime || mLastTime == 0)
-        mLastTime = timePassed;
-
-    // If not enough time has passed yet, do nothing
-    if (timePassed <= mLastTime || !mAnimation)
-        return;
-
     mAnimationTime += timePassed;
 
     while (mAnimationTime > mCurrentFrame->delay && mCurrentFrame->delay > 0)
diff --git a/src/simpleanimation.h b/src/simpleanimation.h
index 384823b7..5583e449 100644
--- a/src/simpleanimation.h
+++ b/src/simpleanimation.h
@@ -64,9 +64,6 @@ class SimpleAnimation
         /** The hosted animation. */
         Animation *mAnimation;
 
-        /**< The last time update was called. */
-        unsigned int mLastTime;
-
         /** Time in game ticks the current frame is shown. */
         unsigned int mAnimationTime;