From 78e438b7043eff243a21833d4709ef432eb7a818 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 30 Dec 2015 21:38:56 +0300
Subject: Fix animation time for new animated sprites.

---
 src/being/being.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/being/being.cpp')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index e0186e6d3..26bfab3ee 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2500,6 +2500,8 @@ void Being::setSprite(const unsigned int slot,
         const ItemInfo &info = ItemDB::get(id);
         const std::string &restrict filename = info.getSprite(
             mGender, mSubType);
+        int lastTime = 0;
+        int startTime = 0;
         AnimatedSprite *restrict equipmentSprite = nullptr;
 
         if (!isTempSprite && mType == ActorType::Player)
@@ -2522,10 +2524,8 @@ void Being::setSprite(const unsigned int slot,
         if (equipmentSprite)
         {
             equipmentSprite->setSpriteDirection(getSpriteDirection());
-
-            // call reset here is not the best idea, but for now this is
-            // only way to sync just loaded sprite
-            reset();
+            startTime = getStartTime();
+            lastTime = getLastTime();
         }
 
         CompoundSprite::setSprite(slot, equipmentSprite);
@@ -2537,6 +2537,14 @@ void Being::setSprite(const unsigned int slot,
             mEquippedWeapon = &ItemDB::get(id);
 
         setAction(mAction, 0);
+        if (equipmentSprite)
+        {
+            if (lastTime > 0)
+            {
+                equipmentSprite->setLastTime(startTime);
+                equipmentSprite->update(lastTime);
+            }
+        }
     }
 
     if (!isTempSprite)
-- 
cgit v1.2.3-70-g09d2