flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Rewritten all packets to use buffers instead of direct sockets, for future cSocketThreads compatibility.

Browse Source 
Moved data sending from cPacket into cSocket

git-svn-id: http://mc-server.googlecode.com/svn/trunk@240 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-02-07 20:49:52 +00:00
parent 16feb0924e
commit b7d524423c
109 changed files with 1896 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/packets/cPacket_EntityEquipment.cpp
View File

@@ -16,34 +16,33 @@ cPacket_EntityEquipment::cPacket_EntityEquipment( const cPacket_EntityEquipment
m_Short = 0;
}
bool cPacket_EntityEquipment::Parse(cSocket & a_Socket)
int cPacket_EntityEquipment::Parse(const char * a_Data, int a_Size)
{
m_Socket = a_Socket;
if( !ReadInteger( m_UniqueID ) ) return false;
if( !ReadShort ( m_Slot ) ) return false;
if( !ReadShort ( m_ItemID ) ) return false;
if( !ReadShort ( m_Short ) ) return false;
return true;
int TotalBytes = 0;
HANDLE_PACKET_READ(ReadInteger, m_UniqueID, TotalBytes);
HANDLE_PACKET_READ(ReadShort, m_Slot, TotalBytes);
HANDLE_PACKET_READ(ReadShort, m_ItemID, TotalBytes);
HANDLE_PACKET_READ(ReadShort, m_Short, TotalBytes);
return TotalBytes;
}
bool cPacket_EntityEquipment::Send(cSocket & a_Socket)
void cPacket_EntityEquipment::Serialize(AString & a_Data) const
{
//LOG("InventoryChange:");
unsigned int TotalSize = c_Size;
char* Message = new char[TotalSize];
AppendByte (a_Data, m_PacketID);
AppendInteger(a_Data, m_UniqueID);
AppendShort (a_Data, m_Slot);
AppendShort (a_Data, m_ItemID);
AppendShort (a_Data, m_Short);
}
if( m_ItemID <= 0 ) m_ItemID = -1; // Fix, to make sure no invalid values are sent.
// WARNING: HERE ITS -1, BUT IN NAMED ENTITY SPAWN PACKET ITS 0 !!
//LOG("cPacket_EntityEquipment: Sending equipped item ID: %i", m_ItemID );
unsigned int i = 0;
AppendByte ( (char)m_PacketID, Message, i );
AppendInteger( m_UniqueID, Message, i );
AppendShort ( m_Slot, Message, i );
AppendShort ( m_ItemID, Message, i );
AppendShort ( m_Short, Message, i );
bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) );
delete [] Message;
return RetVal;
}