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_NewInvalidState.cpp | 39 +++++++++++++++++------------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'source/packets/cPacket_NewInvalidState.cpp') diff --git a/source/packets/cPacket_NewInvalidState.cpp b/source/packets/cPacket_NewInvalidState.cpp index ce9b9d12a..a243a0e51 100644 --- a/source/packets/cPacket_NewInvalidState.cpp +++ b/source/packets/cPacket_NewInvalidState.cpp @@ -10,28 +10,33 @@ cPacket_NewInvalidState::cPacket_NewInvalidState( const cPacket_NewInvalidState & a_Copy ) { m_PacketID = E_NEW_INVALID_STATE; - m_Reason = a_Copy.m_Reason; + m_Reason = a_Copy.m_Reason; m_GameMode = a_Copy.m_GameMode; } -bool cPacket_NewInvalidState::Parse(cSocket & a_Socket) { - m_Socket = a_Socket; - if( !ReadByte ( m_Reason ) ) return false; - if( !ReadByte ( m_GameMode ) ) return false; - return true; -} -bool cPacket_NewInvalidState::Send(cSocket & a_Socket) + + + +int cPacket_NewInvalidState::Parse(const char * a_Data, int a_Size) { - unsigned int TotalSize = c_Size; - char* Message = new char[TotalSize]; + int TotalBytes = 0; + HANDLE_PACKET_READ(ReadByte, m_Reason, TotalBytes); + HANDLE_PACKET_READ(ReadByte, m_GameMode, TotalBytes); + return TotalBytes; +} + + - unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); - AppendByte ( m_Reason, Message, i ); - AppendByte ( m_GameMode, Message, i ); - bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); - delete [] Message; - return RetVal; + +void cPacket_NewInvalidState::Serialize(AString & a_Data) const +{ + AppendByte(a_Data, m_PacketID); + AppendByte(a_Data, m_Reason); + AppendByte(a_Data, m_GameMode); } + + + + -- cgit v1.2.3