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.h | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'source/packets/cPacket_MultiBlock.h') diff --git a/source/packets/cPacket_MultiBlock.h b/source/packets/cPacket_MultiBlock.h index cd2e5b8f7..31cb96628 100644 --- a/source/packets/cPacket_MultiBlock.h +++ b/source/packets/cPacket_MultiBlock.h @@ -24,15 +24,10 @@ public: : m_ChunkX( 0 ) , m_ChunkZ( 0 ) , m_NumBlocks( 0 ) -#if (MINECRAFT_1_2_2 == 1) , m_DataSize( 0 ) - , m_Data( 0 ) -#else - , m_BlockCoordinates( 0 ) - , m_BlockTypes( 0 ) - , m_BlockMetas( 0 ) -#endif + , m_Data( NULL ) { m_PacketID = E_MULTI_BLOCK; } + cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ); ~cPacket_MultiBlock(); virtual cPacket* Clone() const { return new cPacket_MultiBlock(*this); } @@ -43,17 +38,8 @@ public: int m_ChunkZ; short m_NumBlocks; -#if (MINECRAFT_1_2_2 == 1) - int m_DataSize; // Should be 4*m_NumBlocks ?? - sBlockChange* m_Data; - static const unsigned int cSize = 1 + 4 + 4 + 2 + 4; // Minimum size (when NumBlocks == 0) -#else - static const unsigned int c_Size = 1 + 4 + 4 + 2; // Minimum size (when NumBlocks == 0) - - unsigned short* m_BlockCoordinates; // x<<12 | z<<8 | y - char* m_BlockTypes; - char* m_BlockMetas; -#endif + int m_DataSize; // Should be 4 * m_NumBlocks ?? + sBlockChange * m_Data; }; -- cgit v1.2.3