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_NamedEntitySpawn.cpp | 44 +++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'source/packets/cPacket_NamedEntitySpawn.cpp') diff --git a/source/packets/cPacket_NamedEntitySpawn.cpp b/source/packets/cPacket_NamedEntitySpawn.cpp index 8718bb206..9a8fcfd14 100644 --- a/source/packets/cPacket_NamedEntitySpawn.cpp +++ b/source/packets/cPacket_NamedEntitySpawn.cpp @@ -7,26 +7,28 @@ -bool cPacket_NamedEntitySpawn::Send( cSocket & a_Socket ) +void cPacket_NamedEntitySpawn::Serialize(AString & a_Data) const { - unsigned int TotalSize = c_Size + m_PlayerName.size() * sizeof( short ); - char* Message = new char[TotalSize]; - - if( m_CurrentItem <= 0 ) m_CurrentItem = 0; // Fix, to make sure no invalid values are sent. - // WARNING: HERE ITS 0, BUT IN EQUIP PACKET ITS -1 !! - - unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); - AppendInteger( m_UniqueID, Message, i ); - AppendString16( m_PlayerName, 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 ); - AppendShort ( m_CurrentItem, Message, i ); - - bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); - delete [] Message; - return RetVal; + short CurrentItem = m_CurrentItem; + assert(CurrentItem > 0); + if (CurrentItem <= 0) + { + CurrentItem = 0; + // Fix, to make sure no invalid values are sent. + // WARNING: HERE ITS 0, BUT IN EQUIP PACKET ITS -1 !! + } + + AppendByte (a_Data, m_PacketID); + AppendInteger (a_Data, m_UniqueID); + AppendString16(a_Data, m_PlayerName); + 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); + AppendShort (a_Data, CurrentItem); } + + + + -- cgit v1.2.3