From b7d524423c23470cd11e720eeb48368c072838cb Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 7 Feb 2012 20:49:52 +0000 Subject: Rewritten all packets to use buffers instead of direct sockets, for future cSocketThreads compatibility. Moved data sending from cPacket into cSocket git-svn-id: http://mc-server.googlecode.com/svn/trunk@240 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_WholeInventory.cpp | 41 +++++++++++++++++-------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'source/packets/cPacket_WholeInventory.cpp') diff --git a/source/packets/cPacket_WholeInventory.cpp b/source/packets/cPacket_WholeInventory.cpp index 130d4dc8c..5e83f481f 100644 --- a/source/packets/cPacket_WholeInventory.cpp +++ b/source/packets/cPacket_WholeInventory.cpp @@ -20,6 +20,10 @@ cPacket_WholeInventory::cPacket_WholeInventory( const cPacket_WholeInventory & a memcpy( m_Items, a_Clone.m_Items, sizeof(cItem)*m_Count ); } + + + + cPacket_WholeInventory::cPacket_WholeInventory( cInventory* a_Inventory ) { m_PacketID = E_INVENTORY_WHOLE; @@ -29,6 +33,10 @@ cPacket_WholeInventory::cPacket_WholeInventory( cInventory* a_Inventory ) memcpy( m_Items, a_Inventory->GetSlots(), sizeof(cItem)*m_Count ); } + + + + cPacket_WholeInventory::cPacket_WholeInventory( cWindow* a_Window ) { m_PacketID = E_INVENTORY_WHOLE; @@ -38,37 +46,32 @@ cPacket_WholeInventory::cPacket_WholeInventory( cWindow* a_Window ) memcpy( m_Items, a_Window->GetSlots(), sizeof(cItem)*m_Count ); } + + + + cPacket_WholeInventory::~cPacket_WholeInventory() { delete [] m_Items; } -bool cPacket_WholeInventory::Send(cSocket & a_Socket) -{ - unsigned int TotalSize = c_Size; - cPacket_ItemData Item; - for(int i = 0; i < m_Count; i++) - { - TotalSize += Item.GetSize((short) m_Items[i].m_ItemID); - } - char* Message = new char[TotalSize]; - unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); - AppendByte ( m_WindowID, Message, i ); - AppendShort ( m_Count, Message, i ); +void cPacket_WholeInventory::Serialize(AString & a_Data) const +{ + AppendByte (a_Data, m_PacketID); + AppendByte (a_Data, m_WindowID); + AppendShort(a_Data, m_Count); - for(int j = 0; j < m_Count; j++) + for (int j = 0; j < m_Count; j++) { - Item.AppendItem(Message, i, &(m_Items[j])); + cPacket_ItemData::AppendItem(a_Data, &(m_Items[j])); } - - bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); - delete [] Message; - return RetVal; } + + + \ No newline at end of file -- cgit v1.2.3