Removed version 29 serilization
This has been unused since support for <1.7 has been dropped.
This commit is contained in:
parent
b259ab53fb
commit
6687ed03a1
@ -43,7 +43,6 @@ const AString & cChunkDataSerializer::Serialize(int a_Version, int a_ChunkX, int
|
|||||||
AString data;
|
AString data;
|
||||||
switch (a_Version)
|
switch (a_Version)
|
||||||
{
|
{
|
||||||
case RELEASE_1_2_5: Serialize29(data); break;
|
|
||||||
case RELEASE_1_3_2: Serialize39(data); break;
|
case RELEASE_1_3_2: Serialize39(data); break;
|
||||||
case RELEASE_1_8_0: Serialize47(data, a_ChunkX, a_ChunkZ); break;
|
case RELEASE_1_8_0: Serialize47(data, a_ChunkX, a_ChunkZ); break;
|
||||||
// TODO: Other protocol versions may serialize the data differently; implement here
|
// TODO: Other protocol versions may serialize the data differently; implement here
|
||||||
@ -65,65 +64,6 @@ const AString & cChunkDataSerializer::Serialize(int a_Version, int a_ChunkX, int
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cChunkDataSerializer::Serialize29(AString & a_Data)
|
|
||||||
{
|
|
||||||
// TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib can stream)
|
|
||||||
|
|
||||||
const int BiomeDataSize = cChunkDef::Width * cChunkDef::Width;
|
|
||||||
const int MetadataOffset = sizeof(m_BlockTypes);
|
|
||||||
const int BlockLightOffset = MetadataOffset + sizeof(m_BlockMetas);
|
|
||||||
const int SkyLightOffset = BlockLightOffset + sizeof(m_BlockLight);
|
|
||||||
const int BiomeOffset = SkyLightOffset + sizeof(m_BlockSkyLight);
|
|
||||||
const int DataSize = BiomeOffset + BiomeDataSize;
|
|
||||||
|
|
||||||
// Temporary buffer for the composed data:
|
|
||||||
char AllData [DataSize];
|
|
||||||
|
|
||||||
memcpy(AllData, m_BlockTypes, sizeof(m_BlockTypes));
|
|
||||||
memcpy(AllData + MetadataOffset, m_BlockMetas, sizeof(m_BlockMetas));
|
|
||||||
memcpy(AllData + BlockLightOffset, m_BlockLight, sizeof(m_BlockLight));
|
|
||||||
memcpy(AllData + SkyLightOffset, m_BlockSkyLight, sizeof(m_BlockSkyLight));
|
|
||||||
memcpy(AllData + BiomeOffset, m_BiomeData, BiomeDataSize);
|
|
||||||
|
|
||||||
// Compress the data:
|
|
||||||
// In order not to use allocation, use a fixed-size buffer, with the size
|
|
||||||
// that uses the same calculation as compressBound():
|
|
||||||
const uLongf CompressedMaxSize = DataSize + (DataSize >> 12) + (DataSize >> 14) + (DataSize >> 25) + 16;
|
|
||||||
char CompressedBlockData[CompressedMaxSize];
|
|
||||||
|
|
||||||
uLongf CompressedSize = compressBound(DataSize);
|
|
||||||
|
|
||||||
// Run-time check that our compile-time guess about CompressedMaxSize was enough:
|
|
||||||
ASSERT(CompressedSize <= CompressedMaxSize);
|
|
||||||
|
|
||||||
compress2((Bytef*)CompressedBlockData, &CompressedSize, (const Bytef*)AllData, sizeof(AllData), Z_DEFAULT_COMPRESSION);
|
|
||||||
|
|
||||||
// Now put all those data into a_Data:
|
|
||||||
|
|
||||||
// "Ground-up continuous", or rather, "biome data present" flag:
|
|
||||||
a_Data.push_back('\x01');
|
|
||||||
|
|
||||||
// Two bitmaps; we're aways sending the full chunk with no additional data, so the bitmaps are 0xffff and 0, respectively
|
|
||||||
// Also, no endian flipping is needed because of the const values
|
|
||||||
unsigned short BitMap1 = 0xffff;
|
|
||||||
unsigned short BitMap2 = 0;
|
|
||||||
a_Data.append((const char *)&BitMap1, sizeof(short));
|
|
||||||
a_Data.append((const char *)&BitMap2, sizeof(short));
|
|
||||||
|
|
||||||
UInt32 CompressedSizeBE = htonl((UInt32)CompressedSize);
|
|
||||||
a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));
|
|
||||||
|
|
||||||
Int32 UnusedInt32 = 0;
|
|
||||||
a_Data.append((const char *)&UnusedInt32, sizeof(UnusedInt32));
|
|
||||||
|
|
||||||
a_Data.append(CompressedBlockData, CompressedSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cChunkDataSerializer::Serialize39(AString & a_Data)
|
void cChunkDataSerializer::Serialize39(AString & a_Data)
|
||||||
{
|
{
|
||||||
// TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib can stream)
|
// TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib can stream)
|
||||||
|
@ -22,14 +22,12 @@ protected:
|
|||||||
|
|
||||||
Serializations m_Serializations;
|
Serializations m_Serializations;
|
||||||
|
|
||||||
void Serialize29(AString & a_Data); // Release 1.2.4 and 1.2.5
|
|
||||||
void Serialize39(AString & a_Data); // Release 1.3.1 to 1.7.10
|
void Serialize39(AString & a_Data); // Release 1.3.1 to 1.7.10
|
||||||
void Serialize47(AString & a_Data, int a_ChunkX, int a_ChunkZ); // Release 1.8
|
void Serialize47(AString & a_Data, int a_ChunkX, int a_ChunkZ); // Release 1.8
|
||||||
|
|
||||||
public:
|
public:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
RELEASE_1_2_5 = 29,
|
|
||||||
RELEASE_1_3_2 = 39,
|
RELEASE_1_3_2 = 39,
|
||||||
RELEASE_1_8_0 = 47,
|
RELEASE_1_8_0 = 47,
|
||||||
} ;
|
} ;
|
||||||
|
Loading…
Reference in New Issue
Block a user