Merged trunk development between revisions 2530 and 2618 to the 0.1.0 branch.

1 files changed, 18 insertions, 2 deletions

diff --git a/src/animation.cpp b/src/animation.cpp
index 1213d0d6..c1b27ebd 100644
--- a/src/animation.cpp
+++ b/src/animation.cpp
@@ -27,9 +27,15 @@
 
 #include "utils/dtor.h"
 
-Animation::Animation():
-    mTime(0)
+Animation::Animation()
 {
+    reset();
+}
+
+void
+Animation::reset()
+{
+    mTime = 0;
     iCurrentPhase = mAnimationPhases.begin();
 }
 
@@ -123,3 +129,13 @@ Action::setAnimation(int direction, Animation *animation)
 
     mAnimations[direction] = animation;
 }
+
+void
+Action::reset()
+{
+    for (AnimationIterator i = mAnimations.begin();
+         i != mAnimations.end(); ++i)
+    {
+        i->second->reset();
+    }
+}