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
This commit is contained in:
@@ -7,41 +7,41 @@
|
||||
|
||||
|
||||
|
||||
bool cPacket_PickupSpawn::Parse( cSocket & a_Socket )
|
||||
int cPacket_PickupSpawn::Parse(const char * a_Data, int a_Size)
|
||||
{
|
||||
m_Socket = a_Socket;
|
||||
if( !ReadInteger( m_UniqueID ) ) return false;
|
||||
if( !ReadShort ( m_Item ) ) return false;
|
||||
if( !ReadByte ( m_Count ) ) return false;
|
||||
if( !ReadShort ( m_Health ) ) return false;
|
||||
if( !ReadInteger( m_PosX ) ) return false;
|
||||
if( !ReadInteger( m_PosY ) ) return false;
|
||||
if( !ReadInteger( m_PosZ ) ) return false;
|
||||
if( !ReadByte ( m_Rotation ) ) return false;
|
||||
if( !ReadByte ( m_Pitch ) ) return false;
|
||||
if( !ReadByte ( m_Roll ) ) return false;
|
||||
return true;
|
||||
int TotalBytes = 0;
|
||||
HANDLE_PACKET_READ(ReadInteger, m_UniqueID, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadShort, m_Item, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_Count, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadShort, m_Health, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_PosX, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_PosY, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_PosZ, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_Rotation, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_Pitch, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadByte, m_Roll, TotalBytes);
|
||||
return TotalBytes;
|
||||
}
|
||||
|
||||
bool cPacket_PickupSpawn::Send( cSocket & a_Socket )
|
||||
|
||||
|
||||
|
||||
|
||||
void cPacket_PickupSpawn::Serialize(AString & a_Data) const
|
||||
{
|
||||
unsigned int TotalSize = c_Size;
|
||||
char* Message = new char[TotalSize];
|
||||
AppendByte (a_Data, m_PacketID);
|
||||
AppendInteger(a_Data, m_UniqueID);
|
||||
AppendShort (a_Data, m_Item);
|
||||
AppendByte (a_Data, m_Count);
|
||||
AppendShort (a_Data, m_Health);
|
||||
AppendInteger(a_Data, m_PosX);
|
||||
AppendInteger(a_Data, m_PosY);
|
||||
AppendInteger(a_Data, m_PosZ);
|
||||
AppendByte (a_Data, m_Rotation);
|
||||
AppendByte (a_Data, m_Pitch);
|
||||
AppendByte (a_Data, m_Roll);
|
||||
}
|
||||
|
||||
|
||||
|
||||
unsigned int i = 0;
|
||||
AppendByte ( (char)m_PacketID, Message, i );
|
||||
AppendInteger( m_UniqueID, Message, i );
|
||||
AppendShort ( m_Item, Message, i );
|
||||
AppendByte ( m_Count, Message, i );
|
||||
AppendShort ( m_Health, Message, i );
|
||||
AppendInteger( m_PosX, Message, i );
|
||||
AppendInteger( m_PosY, Message, i );
|
||||
AppendInteger( m_PosZ, Message, i );
|
||||
AppendByte ( m_Rotation, Message, i );
|
||||
AppendByte ( m_Pitch, Message, i );
|
||||
AppendByte ( m_Roll, Message, i );
|
||||
|
||||
bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) );
|
||||
delete [] Message;
|
||||
return RetVal;
|
||||
}
|
||||
Reference in New Issue
Block a user