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.cpp | 45 ------------------------------------- 1 file changed, 45 deletions(-) (limited to 'source/packets/cPacket_MapChunk.cpp') diff --git a/source/packets/cPacket_MapChunk.cpp b/source/packets/cPacket_MapChunk.cpp index 17249c25d..501e4df2d 100644 --- a/source/packets/cPacket_MapChunk.cpp +++ b/source/packets/cPacket_MapChunk.cpp @@ -23,9 +23,6 @@ cPacket_MapChunk::cPacket_MapChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, con { m_PacketID = E_MAP_CHUNK; -#if (MINECRAFT_1_2_2 == 1 ) - - // ... m_PosX = a_ChunkX; // Chunk coordinates now, instead of block coordinates m_PosZ = a_ChunkZ; @@ -113,24 +110,6 @@ cPacket_MapChunk::cPacket_MapChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, con m_CompressedData = CompressedBlockData; m_CompressedSize = CompressedSize; - -#else - m_PosX = a_ChunkX * cChunkDef::Width; // It has to be block coordinates - m_PosY = (short)(a_ChunkY * cChunkDef::Height); - m_PosZ = a_ChunkZ * cChunkDef::Width; - - m_SizeX = 15; - m_SizeY = 127; - m_SizeZ = 15; - - uLongf CompressedSize = compressBound( cChunkDef::BlockDataSize ); - char * CompressedBlockData = new char[CompressedSize]; - - compress2( (Bytef*)CompressedBlockData, &CompressedSize, (const Bytef*)a_BlockData, cChunkDef::BlockDataSize, Z_DEFAULT_COMPRESSION); - - m_CompressedData = CompressedBlockData; - m_CompressedSize = CompressedSize; -#endif } @@ -141,7 +120,6 @@ cPacket_MapChunk::cPacket_MapChunk( const cPacket_MapChunk & a_Copy ) { m_PacketID = E_MAP_CHUNK; -#if (MINECRAFT_1_2_2 == 1 ) m_PosX = a_Copy.m_PosX; m_PosZ = a_Copy.m_PosZ; m_bContiguous = a_Copy.m_bContiguous; @@ -151,18 +129,6 @@ cPacket_MapChunk::cPacket_MapChunk( const cPacket_MapChunk & a_Copy ) m_CompressedSize = a_Copy.m_CompressedSize; m_CompressedData = new char[m_CompressedSize]; memcpy( m_CompressedData, a_Copy.m_CompressedData, m_CompressedSize ); -#else - m_PosX = a_Copy.m_PosX; - m_PosY = a_Copy.m_PosY; - m_PosZ = a_Copy.m_PosZ; - m_SizeX = a_Copy.m_SizeX; - m_SizeY = a_Copy.m_SizeY; - m_SizeZ = a_Copy.m_SizeZ; - - m_CompressedSize = a_Copy.m_CompressedSize; - m_CompressedData = new char[m_CompressedSize]; - memcpy( m_CompressedData, a_Copy.m_CompressedData, m_CompressedSize ); -#endif } @@ -173,7 +139,6 @@ void cPacket_MapChunk::Serialize(AString & a_Data) const { AppendByte (a_Data, m_PacketID); -#if (MINECRAFT_1_2_2 == 1 ) AppendInteger(a_Data, m_PosX); AppendInteger(a_Data, m_PosZ); AppendBool (a_Data, m_bContiguous); @@ -182,16 +147,6 @@ void cPacket_MapChunk::Serialize(AString & a_Data) const AppendInteger(a_Data, m_CompressedSize); AppendInteger(a_Data, m_UnusedInt); AppendData (a_Data, m_CompressedData, m_CompressedSize); -#else - AppendInteger(a_Data, m_PosX); - AppendShort (a_Data, m_PosY); - AppendInteger(a_Data, m_PosZ); - AppendByte (a_Data, m_SizeX); - AppendByte (a_Data, m_SizeY); - AppendByte (a_Data, m_SizeZ); - AppendInteger(a_Data, m_CompressedSize); - AppendData (a_Data, m_CompressedData, m_CompressedSize); -#endif } -- cgit v1.2.3