diff options
| author | Ira Rice <irarice@gmail.com> | 2009-02-11 00:20:28 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-02-11 00:20:28 -0700 |
| commit | d036e2c771bcd19a21e26aec155d4269cecdb1c2 (patch) | |
| tree | 53d9e0224e8964534fa1a8c6ca62f0b56f2ae81a /src/simpleanimation.cpp | |
| parent | 4f038e895499fcf94fec168ef964f7de4f813113 (diff) | |
| download | Mana-d036e2c771bcd19a21e26aec155d4269cecdb1c2.tar.gz Mana-d036e2c771bcd19a21e26aec155d4269cecdb1c2.tar.bz2 Mana-d036e2c771bcd19a21e26aec155d4269cecdb1c2.tar.xz Mana-d036e2c771bcd19a21e26aec155d4269cecdb1c2.zip | |
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>
Diffstat (limited to 'src/simpleanimation.cpp')
| -rw-r--r-- | src/simpleanimation.cpp | 8 |
1 files changed, 0 insertions, 8 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) |