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_MapChunk.h | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'source/packets/cPacket_MapChunk.h') diff --git a/source/packets/cPacket_MapChunk.h b/source/packets/cPacket_MapChunk.h index 0b2bef7ad..27e1ec8e5 100644 --- a/source/packets/cPacket_MapChunk.h +++ b/source/packets/cPacket_MapChunk.h @@ -13,7 +13,6 @@ class cPacket_MapChunk : { public: cPacket_MapChunk() -#if (MINECRAFT_1_2_2 == 1 ) : m_PosX( 0 ) , m_PosZ( 0 ) , m_bContiguous( false ) @@ -21,17 +20,8 @@ public: , m_BitMap2( 0 ) , m_CompressedSize( 0 ) , m_UnusedInt( 0 ) -#else - : m_PosX( 0 ) - , m_PosY( 0 ) - , m_PosZ( 0 ) - , m_SizeX( 0 ) - , m_SizeY( 0 ) - , m_SizeZ( 0 ) - , m_CompressedSize( 0 ) -#endif - , m_CompressedData( 0 ) - { m_PacketID = E_MAP_CHUNK; m_CompressedData = 0; } + , m_CompressedData( NULL ) + { m_PacketID = E_MAP_CHUNK; } cPacket_MapChunk( const cPacket_MapChunk & a_Copy ); cPacket_MapChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, const BLOCKTYPE * a_BlockData, const BIOMETYPE * a_BiomeData); @@ -40,27 +30,13 @@ public: virtual void Serialize(AString & a_Data) const override; -#if (MINECRAFT_1_2_2 == 1 ) int m_PosX; int m_PosZ; - bool m_bContiguous; // le fuck? + bool m_bContiguous; short m_BitMap1; short m_BitMap2; int m_CompressedSize; int m_UnusedInt; - static const unsigned int c_Size = 1 + 4 + 4 + 1 + 2 + 2 + 4 + 4; -#else - int m_PosX; // In block coordinates - short m_PosY; - int m_PosZ; - char m_SizeX; // Is actually size-1 (when size is 128, this is 127) - char m_SizeY; - char m_SizeZ; - int m_CompressedSize; - static const unsigned int c_Size = 1 + 4 + 2 + 4 + 1 + 1 + 1 + 4; -#endif - - char * m_CompressedData; }; -- cgit v1.2.3