Item phases

src/client/item.cpp

@@ -41,7 +41,10 @@ Item::Item() :
     m_clientId(0),
     m_serverId(0),
     m_countOrSubType(1),
-    m_color(Color::alpha)
+    m_color(Color::alpha),
+    m_async(true),
+    m_phase(0),
+    m_lastPhase(0)
 {
 }
 
@@ -363,9 +366,17 @@ void Item::calculatePatterns(int& xPattern, int& yPattern, int& zPattern)
 int Item::calculateAnimationPhase(bool animate)
 {
     if(getAnimationPhases() > 1) {
-        if(animate)
+        if(animate) {
-            return (g_clock.millis() % (Otc::ITEM_TICKS_PER_FRAME * getAnimationPhases())) / Otc::ITEM_TICKS_PER_FRAME;
+            if(m_async)
-        else
+                return (g_clock.millis() % (Otc::ITEM_TICKS_PER_FRAME * getAnimationPhases())) / Otc::ITEM_TICKS_PER_FRAME;
+            else {
+                if(g_clock.millis() - m_lastPhase >= Otc::ITEM_TICKS_PER_FRAME) {
+                    m_phase = (m_phase + 1) % getAnimationPhases();
+                    m_lastPhase = g_clock.millis();
+                }
+                return m_phase;
+            }
+        } else
             return getAnimationPhases()-1;
     }
     return 0;

src/client/item.h

@@ -112,6 +112,8 @@ public:
     void setActionId(uint16 actionId) { m_attribs.set(ATTR_ACTION_ID, actionId); }
     void setUniqueId(uint16 uniqueId) { m_attribs.set(ATTR_UNIQUE_ID, uniqueId); }
 
+    void setAsync(bool enable) { m_async = enable; }
+
     bool isHouseDoor() { return m_attribs.has(ATTR_HOUSEDOORID); }
     bool isDepot() { return m_attribs.has(ATTR_DEPOT_ID); }
     bool isContainer() { return m_attribs.has(ATTR_CONTAINER_ITEMS); }
@@ -141,6 +143,10 @@ private:
     stdext::packed_storage<uint8> m_attribs;
     ItemList m_containerItems;
     Color m_color;
+    bool m_async;
+
+    uint8 m_phase;
+    ticks_t m_lastPhase;
 };
 
 #pragma pack(pop)

src/client/protocolgameparse.cpp

@@ -2008,7 +2008,7 @@ ItemPtr ProtocolGame::getItem(const InputMessagePtr& msg, int id)
         if(item->getAnimationPhases() > 1) {
             // 0xfe => random phase
             // 0xff => async?
-            msg->getU8(); // phase
+            item->setAsync(msg->getU8() == 0xff);
         }
     }