diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/packets/cPacket_MapChunk.cpp | 58 | ||||
| -rw-r--r-- | source/packets/cPacket_MapChunk.h | 22 |
2 files changed, 80 insertions, 0 deletions
diff --git a/source/packets/cPacket_MapChunk.cpp b/source/packets/cPacket_MapChunk.cpp index 54ebc6be5..859db47f3 100644 --- a/source/packets/cPacket_MapChunk.cpp +++ b/source/packets/cPacket_MapChunk.cpp @@ -24,6 +24,38 @@ cPacket_MapChunk::cPacket_MapChunk(cChunk * a_Chunk) ASSERT(a_Chunk->IsValid());
m_PacketID = E_MAP_CHUNK;
+#if (MINECRAFT_1_2_2 == 1 )
+
+ // ...
+ m_PosX = a_Chunk->GetPosX(); // Chunk coordinates now, instead of block coordinates
+ m_PosZ = a_Chunk->GetPosZ();
+
+ m_bContiguous = false;
+ m_BitMap1 = 0;
+ m_BitMap2 = 0;
+
+ m_UnusedInt = 0;
+
+ for( int i = 0; i < 16; ++i )
+ {
+ m_BitMap1 |= (1 << i);
+ }
+
+ unsigned int DataSize = 16 * (4096 + 2048 + 2048 + 2048);
+ char* AllData = new char[ DataSize ];
+ memset( AllData, 0, DataSize );
+
+ uLongf CompressedSize = compressBound( DataSize );
+ char * CompressedBlockData = new char[CompressedSize];
+
+ compress2( (Bytef*)CompressedBlockData, &CompressedSize, (const Bytef*)AllData, DataSize, Z_DEFAULT_COMPRESSION);
+
+ delete [] AllData;
+
+ m_CompressedData = CompressedBlockData;
+ m_CompressedSize = CompressedSize;
+
+#else
m_PosX = a_Chunk->GetPosX() * 16; // It has to be block coordinates
m_PosY = (short)(a_Chunk->GetPosY() * 128);
m_PosZ = a_Chunk->GetPosZ() * 16;
@@ -39,6 +71,7 @@ cPacket_MapChunk::cPacket_MapChunk(cChunk * a_Chunk) m_CompressedData = CompressedBlockData;
m_CompressedSize = CompressedSize;
+#endif
}
@@ -48,6 +81,18 @@ cPacket_MapChunk::cPacket_MapChunk(cChunk * a_Chunk) 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;
+ m_BitMap1 = a_Copy.m_BitMap1;
+ m_BitMap2 = a_Copy.m_BitMap2;
+
+ 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;
@@ -58,6 +103,7 @@ 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 );
+#endif
}
@@ -67,6 +113,17 @@ cPacket_MapChunk::cPacket_MapChunk( const cPacket_MapChunk & a_Copy ) 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);
+ AppendShort (a_Data, m_BitMap1);
+ AppendShort (a_Data, m_BitMap2);
+ 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);
@@ -75,6 +132,7 @@ void cPacket_MapChunk::Serialize(AString & a_Data) const AppendByte (a_Data, m_SizeZ);
AppendInteger(a_Data, m_CompressedSize);
AppendData (a_Data, m_CompressedData, m_CompressedSize);
+#endif
}
diff --git a/source/packets/cPacket_MapChunk.h b/source/packets/cPacket_MapChunk.h index 2cefd8b59..72cef7d25 100644 --- a/source/packets/cPacket_MapChunk.h +++ b/source/packets/cPacket_MapChunk.h @@ -18,6 +18,15 @@ class cPacket_MapChunk : {
public:
cPacket_MapChunk()
+#if (MINECRAFT_1_2_2 == 1 )
+ : m_PosX( 0 )
+ , m_PosZ( 0 )
+ , m_bContiguous( false )
+ , m_BitMap1( 0 )
+ , m_BitMap2( 0 )
+ , m_CompressedSize( 0 )
+ , m_UnusedInt( 0 )
+#else
: m_PosX( 0 )
, m_PosY( 0 )
, m_PosZ( 0 )
@@ -25,6 +34,7 @@ public: , m_SizeY( 0 )
, m_SizeZ( 0 )
, m_CompressedSize( 0 )
+#endif
, m_CompressedData( 0 )
{ m_PacketID = E_MAP_CHUNK; m_CompressedData = 0; }
@@ -34,6 +44,16 @@ 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?
+ 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;
@@ -42,6 +62,8 @@ public: char m_SizeZ;
int m_CompressedSize;
static const unsigned int c_Size = 1 + 4 + 2 + 4 + 1 + 1 + 1 + 4;
+#endif
+
char * m_CompressedData;
|