gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Item phases

This commit is contained in:
dalkon 2013-11-13 00:18:15 +01:00
parent 1060c6f78c
commit 59e90e8f1e
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/item.cpp
View File

@ -41,7 +41,10 @@ Item::Item() :
m_clientId(0), m_clientId(0),
m_serverId(0), m_serverId(0),
m_countOrSubType(1), 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) int Item::calculateAnimationPhase(bool animate)
{ {
if(getAnimationPhases() > 1) { 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 getAnimationPhases()-1;
} }
return 0; return 0;

6
src/client/item.h
View File

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

2
src/client/protocolgameparse.cpp
View File

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