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

1 files changed, 10 insertions, 7 deletions

diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 8f9c0600..f984d13f 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -49,12 +49,14 @@ AnimatedSprite::AnimatedSprite(const std::string& animationFile, int variant):
     free(data);
 
     if (!doc) {
-        logger->error("Animation: Error while parsing animation definition file!");
+        logger->error(
+                "Animation: Error while parsing animation definition file!");
     }
 
     xmlNodePtr node = xmlDocGetRootElement(doc);
     if (!node || !xmlStrEqual(node->name, BAD_CAST "sprite")) {
-        logger->error("Animation: this is not a valid animation definition file!");
+        logger->error(
+                "Animation: this is not a valid animation definition file!");
     }
 
     // Get the variant
@@ -233,13 +235,14 @@ AnimatedSprite::~AnimatedSprite()
 void
 AnimatedSprite::reset()
 {
-    // Reset all defined actions (because of aliases, some will be resetted
-    // multiple times)
+    // Reset all defined actions (because of aliases some will be resetted
+    // multiple times, but this doesn't matter)
     for (ActionIterator i = mActions.begin(); i != mActions.end(); ++i)
     {
-        //TODO: If resetting everything is really a nice way of fixing the
-        //      synchronization issues, finish implementing this.
-        //i->second->reset();
+        if (i->second)
+        {
+            i->second->reset();
+        }
     }
 }