Applied patch by Bahamut81 which implements resetting of Animation, Action and

AnimatedSprite. This fixes the animation synchronization issues.

1 files changed, 22 insertions, 7 deletions

diff --git a/src/player.h b/src/player.h
index 15e7f655..21870fb0 100644
--- a/src/player.h
+++ b/src/player.h
@@ -37,19 +37,34 @@ class Player : public Being
     public:
         Player(Uint32 id, Uint16 job, Map *map);
 
-        virtual void logic();
+        virtual void
+        logic();
 
-        virtual Type getType() const;
+        virtual Type
+        getType() const;
 
-        virtual void drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY);
+        virtual void
+        drawName(Graphics *graphics, Sint32 offsetX, Sint32 offsetY);
 
-        virtual void setSex(Uint8 sex);
+        virtual void
+        setSex(Uint8 sex);
 
-        virtual void setHairColor(Uint16 color);
+        virtual void
+        setHairColor(Uint16 color);
 
-        virtual void setHairStyle(Uint16 style);
+        virtual void
+        setHairStyle(Uint16 style);
 
-        virtual void setVisibleEquipment(Uint8 slot, Uint8 id);
+        virtual void
+        setVisibleEquipment(Uint8 slot, Uint8 id);
+
+    private:
+        /**
+         * Resets all animations associated with this player. This is used to
+         * synchronize the animations after a new one has been added.
+         */
+        void
+        resetAnimations();
 };
 
 #endif