From e1ef489e08a91cce377617b99f4c3ed3df5e9d92 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 24 Mar 2012 11:40:29 +0000 Subject: Removed the split between 1.2.3 and 1.1, left only 1.2.3 code git-svn-id: http://mc-server.googlecode.com/svn/trunk@429 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_MultiBlock.cpp | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'source/packets/cPacket_MultiBlock.cpp') diff --git a/source/packets/cPacket_MultiBlock.cpp b/source/packets/cPacket_MultiBlock.cpp index 0d73254ed..cfa13c4d4 100644 --- a/source/packets/cPacket_MultiBlock.cpp +++ b/source/packets/cPacket_MultiBlock.cpp @@ -13,20 +13,9 @@ cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ) m_ChunkX = a_Copy.m_ChunkX; m_ChunkZ = a_Copy.m_ChunkZ; m_NumBlocks = a_Copy.m_NumBlocks; - -#if (MINECRAFT_1_2_2 == 1) m_DataSize = a_Copy.m_DataSize; - m_Data = new sBlockChange[m_NumBlocks]; memcpy( m_Data, a_Copy.m_Data, sizeof(sBlockChange)*m_NumBlocks ); -#else - m_BlockCoordinates = new unsigned short[m_NumBlocks]; - memcpy( m_BlockCoordinates, a_Copy.m_BlockCoordinates, sizeof(short)*m_NumBlocks ); - m_BlockTypes = new char[m_NumBlocks]; - memcpy( m_BlockTypes, a_Copy.m_BlockTypes, m_NumBlocks ); - m_BlockMetas = new char[m_NumBlocks]; - memcpy( m_BlockMetas, a_Copy.m_BlockMetas, m_NumBlocks ); -#endif } @@ -35,13 +24,7 @@ cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ) cPacket_MultiBlock::~cPacket_MultiBlock() { -#if (MINECRAFT_1_2_2 == 1) delete [] m_Data; -#else - if( m_BlockCoordinates ) delete [] m_BlockCoordinates; - if( m_BlockTypes ) delete [] m_BlockTypes; - if( m_BlockMetas ) delete [] m_BlockMetas; -#endif } @@ -55,15 +38,11 @@ void cPacket_MultiBlock::Serialize(AString & a_Data) const AppendInteger(a_Data, m_ChunkZ); AppendShort (a_Data, m_NumBlocks); -#if (MINECRAFT_1_2_2 == 1) AppendInteger(a_Data, m_DataSize); for( int i = 0; i < m_NumBlocks; ++i ) + { AppendInteger(a_Data, m_Data[i].Data); -#else - AppendData (a_Data, (char *)m_BlockCoordinates, sizeof(short) * m_NumBlocks); - AppendData (a_Data, m_BlockTypes, m_NumBlocks); - AppendData (a_Data, m_BlockMetas, m_NumBlocks); -#endif + } } -- cgit v1.2.3