From 92c59963f82f81aa3202657e7fdbb2592924ede3 Mon Sep 17 00:00:00 2001 From: "cedeel@gmail.com" Date: Thu, 14 Jun 2012 13:06:06 +0000 Subject: Attempt to bring sanity to newlines across systems. git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_ItemData.cpp | 162 ++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'source/packets/cPacket_ItemData.cpp') diff --git a/source/packets/cPacket_ItemData.cpp b/source/packets/cPacket_ItemData.cpp index db025a838..0892f433a 100644 --- a/source/packets/cPacket_ItemData.cpp +++ b/source/packets/cPacket_ItemData.cpp @@ -1,81 +1,81 @@ - -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules - -#include "cPacket_ItemData.h" - - - - - -int cPacket_ItemData::Parse(const char * a_Data, int a_Size) -{ - int TotalBytes = 0; - HANDLE_PACKET_READ(ReadShort, m_ItemID, TotalBytes); - - if (m_ItemID <= -1) - { - m_ItemCount = 0; - m_ItemUses = 0; - return TotalBytes; - } - - HANDLE_PACKET_READ(ReadByte , m_ItemCount, TotalBytes); - HANDLE_PACKET_READ(ReadShort, m_ItemUses, TotalBytes); - - if (cItem::IsEnchantable((ENUM_ITEM_ID) m_ItemID)) - { - HANDLE_PACKET_READ(ReadShort, m_EnchantNums, TotalBytes); - - if ( m_EnchantNums > -1 ) - { - // TODO: Enchantment not implemented yet! - } - } - return TotalBytes; -} - - - - - -int cPacket_ItemData::GetSize(short a_ItemID) -{ - if(a_ItemID <= -1) - return 2; - if(cItem::IsEnchantable((ENUM_ITEM_ID) a_ItemID)) - return 7; - return 5; -} - - - - - -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); -} - - - - - -void cPacket_ItemData::AppendItem(AString & a_Data, short a_ItemID, char a_Quantity, short a_Damage) -{ - AppendShort(a_Data, (short) a_ItemID); - if (a_ItemID > -1) - { - AppendByte (a_Data, a_Quantity); - AppendShort(a_Data, a_Damage); - - if (cItem::IsEnchantable((ENUM_ITEM_ID) a_ItemID)) - { - // TODO: Implement enchantments - AppendShort(a_Data, (short) -1); - } - } -} - - - - + +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules + +#include "cPacket_ItemData.h" + + + + + +int cPacket_ItemData::Parse(const char * a_Data, int a_Size) +{ + int TotalBytes = 0; + HANDLE_PACKET_READ(ReadShort, m_ItemID, TotalBytes); + + if (m_ItemID <= -1) + { + m_ItemCount = 0; + m_ItemUses = 0; + return TotalBytes; + } + + HANDLE_PACKET_READ(ReadByte , m_ItemCount, TotalBytes); + HANDLE_PACKET_READ(ReadShort, m_ItemUses, TotalBytes); + + if (cItem::IsEnchantable((ENUM_ITEM_ID) m_ItemID)) + { + HANDLE_PACKET_READ(ReadShort, m_EnchantNums, TotalBytes); + + if ( m_EnchantNums > -1 ) + { + // TODO: Enchantment not implemented yet! + } + } + return TotalBytes; +} + + + + + +int cPacket_ItemData::GetSize(short a_ItemID) +{ + if(a_ItemID <= -1) + return 2; + if(cItem::IsEnchantable((ENUM_ITEM_ID) a_ItemID)) + return 7; + return 5; +} + + + + + +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); +} + + + + + +void cPacket_ItemData::AppendItem(AString & a_Data, short a_ItemID, char a_Quantity, short a_Damage) +{ + AppendShort(a_Data, (short) a_ItemID); + if (a_ItemID > -1) + { + AppendByte (a_Data, a_Quantity); + AppendShort(a_Data, a_Damage); + + if (cItem::IsEnchantable((ENUM_ITEM_ID) a_ItemID)) + { + // TODO: Implement enchantments + AppendShort(a_Data, (short) -1); + } + } +} + + + + -- cgit v1.2.3