diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-01 19:08:53 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-01 19:08:53 +0100 |
| commit | d24c07a550d9de550c77ce575b0b33903d8a639a (patch) | |
| tree | ea977480cdea02cc46b5ab3b133e7417f71104a0 /source/packets/cPacket_MapChunk.cpp | |
| parent | Forgot to update packet size (though I'm not even sure it's used anymore) (diff) | |
| download | cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.tar cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.tar.gz cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.tar.bz2 cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.tar.lz cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.tar.xz cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.tar.zst cuberite-d24c07a550d9de550c77ce575b0b33903d8a639a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/packets/cPacket_MapChunk.cpp | 58 |
1 files changed, 58 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
}
|