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_MultiBlock.cpp | 40 +++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'source/packets/cPacket_MultiBlock.cpp') diff --git a/source/packets/cPacket_MultiBlock.cpp b/source/packets/cPacket_MultiBlock.cpp index 392bc7fef..dbdc11c02 100644 --- a/source/packets/cPacket_MultiBlock.cpp +++ b/source/packets/cPacket_MultiBlock.cpp @@ -21,6 +21,10 @@ cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ) memcpy( m_BlockMetas, a_Copy.m_BlockMetas, m_NumBlocks ); } + + + + cPacket_MultiBlock::~cPacket_MultiBlock() { if( m_BlockCoordinates ) delete [] m_BlockCoordinates; @@ -28,22 +32,22 @@ cPacket_MultiBlock::~cPacket_MultiBlock() if( m_BlockMetas ) delete [] m_BlockMetas; } -bool cPacket_MultiBlock::Send(cSocket & a_Socket) + + + + +void cPacket_MultiBlock::Serialize(AString & a_Data) const { - unsigned int TotalSize = c_Size + m_NumBlocks * ( sizeof(short) + 2*sizeof(char) ); - char* Message = new char[TotalSize]; - - unsigned int i = 0; - AppendByte ( (char)m_PacketID, Message, i ); - AppendInteger ( m_ChunkX, Message, i ); - AppendInteger ( m_ChunkZ, Message, i ); - AppendShort ( m_NumBlocks, Message, i ); - - AppendData ( (char*)m_BlockCoordinates,sizeof(short)*m_NumBlocks, Message, i ); - AppendData ( m_BlockTypes, sizeof(char)*m_NumBlocks, Message, i ); - AppendData ( m_BlockMetas, sizeof(char)*m_NumBlocks, Message, i ); - - bool RetVal = !cSocket::IsSocketError( SendData( a_Socket, Message, TotalSize, 0 ) ); - delete [] Message; - return RetVal; -} \ No newline at end of file + AppendByte (a_Data, m_PacketID); + AppendInteger(a_Data, m_ChunkX); + AppendInteger(a_Data, m_ChunkZ); + AppendShort (a_Data, m_NumBlocks); + + AppendData (a_Data, (char *)m_BlockCoordinates, sizeof(short) * m_NumBlocks); + AppendData (a_Data, m_BlockTypes, m_NumBlocks); + AppendData (a_Data, m_BlockMetas, m_NumBlocks); +} + + + + -- cgit v1.2.3