From e5272cde78d23a297dad05976e8579b3e5759de4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 26 Feb 2012 21:49:39 +0300
Subject: Fix incorrect last dead frame delay for old servers.

---
 src/resources/action.cpp    | 13 +++++++++++++
 src/resources/action.h      |  6 +++++-
 src/resources/animation.cpp | 14 ++++++++++++++
 src/resources/animation.h   |  8 +++++++-
 src/resources/spritedef.cpp | 22 ++++++++++++++++++++--
 src/resources/spritedef.h   |  7 +++++++
 6 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index e1f88ecb7..6c799cdfa 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -69,3 +69,16 @@ void Action::setAnimation(int direction, Animation *animation)
 {
     mAnimations[direction] = animation;
 }
+
+void Action::setLastFrameDelay(int delay)
+{
+    AnimationIter it = mAnimations.begin();
+    AnimationIter it_end = mAnimations.end();
+    for (; it != it_end; ++ it)
+    {
+        Animation *animation = (*it).second;
+        if (!animation)
+            continue;
+        animation->setLastFrameDelay(delay);
+    }
+}
diff --git a/src/resources/action.h b/src/resources/action.h
index 3951cc02c..f9c5da75b 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -29,6 +29,7 @@
 
 class Animation;
 
+
 /**
  * An action consists of several animations, one for each direction.
  */
@@ -49,9 +50,12 @@ class Action
         void setNumber(unsigned n)
         { mNumber = n; }
 
+        void setLastFrameDelay(int delay);
+
     protected:
         typedef std::map<int, Animation*> Animations;
-        typedef Animations::iterator AnimationIterator;
+        typedef Animations::iterator AnimationIter;
+
         Animations mAnimations;
         unsigned mNumber;
 };
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 1c1da6ca5..388c1301e 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -69,3 +69,17 @@ void Animation::addGoto(std::string name, int rand)
     Frame frame = { nullptr, 0, 0, 0, rand, Frame::GOTO, name };
     mFrames.push_back(frame);
 }
+
+void Animation::setLastFrameDelay(int delay)
+{
+    FramesRevIter it = mFrames.rbegin();
+    FramesRevIter it_end = mFrames.rend();
+    for (; it != it_end; ++ it)
+    {
+        if ((*it).type == Frame::ANIMATION && (*it).image)
+        {
+            (*it).delay = delay;
+            break;
+        }
+    }
+}
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 33bfd76e9..53e9adbea 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -102,13 +102,19 @@ class Animation
 
         void addGoto(std::string name, int rand);
 
+        void setLastFrameDelay(int delay);
+
         /**
          * Determines whether the given animation frame is a terminator.
          */
         static bool isTerminator(const Frame &phase);
 
     protected:
-        std::vector<Frame> mFrames;
+        typedef std::vector<Frame> Frames;
+        typedef Frames::iterator FramesIter;
+        typedef Frames::reverse_iterator FramesRevIter;
+
+        Frames mFrames;
         int mDuration;
 };
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 0d9b95f6f..02b46f1cf 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -36,6 +36,7 @@
 #include "debug.h"
 
 SpriteReference *SpriteReference::Empty = nullptr;
+extern int serverVersion;
 
 Action *SpriteDef::getAction(std::string action, unsigned num) const
 {
@@ -99,13 +100,30 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
     def->mProcessedFiles.insert(animationFile);
     def->loadSprite(rootNode, variant, palettes);
     def->substituteActions();
+    if (serverVersion < 1)
+        def->fixDeadAction();
     return def;
 }
 
+void SpriteDef::fixDeadAction()
+{
+    ActionsIter it = mActions.begin();
+    ActionsIter it_end = mActions.end();
+    for (; it != it_end; ++ it)
+    {
+        ActionMap *d = (*it).second;
+        if (!d)
+            continue;
+        ActionMap::iterator i = d->find("dead");
+        if (i != d->end() && i->second)
+            (i->second)->setLastFrameDelay(0);
+    }
+}
+
 void SpriteDef::substituteAction(std::string complete, std::string with)
 {
-    Actions::const_iterator it = mActions.begin();
-    Actions::const_iterator it_end = mActions.end();
+    ActionsConstIter it = mActions.begin();
+    ActionsConstIter it_end = mActions.end();
     for (; it != it_end; ++ it)
     {
         ActionMap *d = (*it).second;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 0490bdcb3..e167cf188 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -175,6 +175,11 @@ class SpriteDef : public Resource
          */
         void substituteActions();
 
+        /**
+         * Fix bad timeout in last dead action frame
+         */
+        void fixDeadAction();
+
         /**
          * When there are no animations defined for the action "complete", its
          * animations become a copy of those of the action "with".
@@ -185,6 +190,8 @@ class SpriteDef : public Resource
         typedef ImageSets::iterator ImageSetIterator;
         typedef std::map<std::string, Action*> ActionMap;
         typedef std::map<unsigned, ActionMap*> Actions;
+        typedef Actions::const_iterator ActionsConstIter;
+        typedef Actions::iterator ActionsIter;
 
         ImageSets mImageSets;
         Actions mActions;
-- 
cgit v1.2.3-60-g2f50