summaryrefslogtreecommitdiffstats
path: root/source/packets/cPacket_ItemData.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/packets/cPacket_ItemData.cpp39
1 files changed, 24 insertions, 15 deletions
diff --git a/source/packets/cPacket_ItemData.cpp b/source/packets/cPacket_ItemData.cpp
index 2e4203bfc..4f0803475 100644
--- a/source/packets/cPacket_ItemData.cpp
+++ b/source/packets/cPacket_ItemData.cpp
@@ -10,25 +10,26 @@
int cPacket_ItemData::Parse(cByteBuffer & a_Buffer)
{
int TotalBytes = 0;
- HANDLE_PACKET_READ(ReadBEShort, m_ItemID, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEShort, m_Dst.m_ItemType, TotalBytes);
- if (m_ItemID <= -1)
+ if (m_Dst.m_ItemType <= -1)
{
- m_ItemCount = 0;
- m_ItemUses = 0;
+ m_Dst.Empty();
return TotalBytes;
}
- HANDLE_PACKET_READ(ReadChar, m_ItemCount, TotalBytes);
- HANDLE_PACKET_READ(ReadBEShort, m_ItemUses, TotalBytes);
+ HANDLE_PACKET_READ(ReadChar, m_Dst.m_ItemCount, TotalBytes);
+ HANDLE_PACKET_READ(ReadBEShort, m_Dst.m_ItemDamage, TotalBytes);
- if (cItem::IsEnchantable((ENUM_ITEM_ID) m_ItemID))
+ if (cItem::IsEnchantable(m_Dst.m_ItemType))
{
- HANDLE_PACKET_READ(ReadBEShort, m_EnchantNums, TotalBytes);
+ short EnchantNumBytes;
+ HANDLE_PACKET_READ(ReadBEShort, EnchantNumBytes, TotalBytes);
- if ( m_EnchantNums > -1 )
+ if (EnchantNumBytes > 0)
{
// TODO: Enchantment not implemented yet!
+ a_Buffer.SkipRead(EnchantNumBytes);
}
}
return TotalBytes;
@@ -51,24 +52,32 @@ int cPacket_ItemData::GetSize(short a_ItemID)
-void cPacket_ItemData::AppendItem(AString & a_Data, const cItem * a_Item)
+void cPacket_ItemData::AppendItem(AString & a_Data, const cItem & a_Item)
{
- return AppendItem(a_Data, a_Item->m_ItemID, a_Item->m_ItemCount, a_Item->m_ItemHealth);
+ return AppendItem(a_Data, a_Item.m_ItemType, a_Item.m_ItemCount, a_Item.m_ItemDamage);
}
-void cPacket_ItemData::AppendItem(AString & a_Data, short a_ItemID, char a_Quantity, short a_Damage)
+void cPacket_ItemData::AppendItem(AString & a_Data, short a_ItemType, char a_Quantity, short a_Damage)
{
- AppendShort(a_Data, (short) a_ItemID);
- if (a_ItemID > -1)
+ short ItemType = a_ItemType;
+ ASSERT(ItemType >= -1); // Check validity of packets in debug runtime
+ if (ItemType <= 0)
+ {
+ // Fix, to make sure no invalid values are sent.
+ ItemType = -1;
+ }
+
+ AppendShort(a_Data, ItemType);
+ if (a_ItemType > -1)
{
AppendByte (a_Data, a_Quantity);
AppendShort(a_Data, a_Damage);
- if (cItem::IsEnchantable((ENUM_ITEM_ID) a_ItemID))
+ if (cItem::IsEnchantable(a_ItemType))
{
// TODO: Implement enchantments
AppendShort(a_Data, (short) -1);