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,42 +7,35 @@
|
||||
|
||||
|
||||
|
||||
bool cPacket_UpdateSign::Parse( cSocket & a_Socket )
|
||||
int cPacket_UpdateSign::Parse(const char * a_Data, int a_Size)
|
||||
{
|
||||
m_Socket = a_Socket;
|
||||
|
||||
if( !ReadInteger( m_PosX ) ) return false;
|
||||
if( !ReadShort ( m_PosY ) ) return false;
|
||||
if( !ReadInteger( m_PosZ ) ) return false;
|
||||
if( !ReadString16 ( m_Line1 ) ) return false;
|
||||
if( !ReadString16 ( m_Line2 ) ) return false;
|
||||
if( !ReadString16 ( m_Line3 ) ) return false;
|
||||
if( !ReadString16 ( m_Line4 ) ) return false;
|
||||
|
||||
return true;
|
||||
int TotalBytes = 0;
|
||||
HANDLE_PACKET_READ(ReadInteger, m_PosX, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadShort, m_PosY, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadInteger, m_PosZ, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_Line1, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_Line2, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_Line3, TotalBytes);
|
||||
HANDLE_PACKET_READ(ReadString16, m_Line4, TotalBytes);
|
||||
return TotalBytes;
|
||||
}
|
||||
|
||||
bool cPacket_UpdateSign::Send( cSocket & a_Socket )
|
||||
|
||||
|
||||
|
||||
|
||||
void cPacket_UpdateSign::Serialize(AString & a_Data) const
|
||||
{
|
||||
unsigned int TotalSize = c_Size;
|
||||
TotalSize += m_Line1.size() * sizeof( short );
|
||||
TotalSize += m_Line2.size() * sizeof( short );
|
||||
TotalSize += m_Line3.size() * sizeof( short );
|
||||
TotalSize += m_Line4.size() * sizeof( short );
|
||||
AppendByte (a_Data, m_PacketID);
|
||||
AppendInteger (a_Data, m_PosX);
|
||||
AppendShort (a_Data, m_PosY);
|
||||
AppendInteger (a_Data, m_PosZ);
|
||||
AppendString16(a_Data, m_Line1);
|
||||
AppendString16(a_Data, m_Line2);
|
||||
AppendString16(a_Data, m_Line3);
|
||||
AppendString16(a_Data, m_Line4);
|
||||
}
|
||||
|
||||
|
||||
char* Message = new char[TotalSize];
|
||||
|
||||
unsigned int i = 0;
|
||||
AppendByte ( (char)m_PacketID, Message, i );
|
||||
AppendInteger ( m_PosX, Message, i );
|
||||
AppendShort ( m_PosY, Message, i );
|
||||
AppendInteger ( m_PosZ, Message, i );
|
||||
AppendString16 ( m_Line1, Message, i );
|
||||
AppendString16 ( m_Line2, Message, i );
|
||||
AppendString16 ( m_Line3, Message, i );
|
||||
AppendString16 ( m_Line4, Message, i );
|
||||
|
||||
bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) );
|
||||
delete [] Message;
|
||||
return RetVal;
|
||||
}
|
||||
Reference in New Issue
Block a user