diff options
| author | madmaxoft <github@xoft.cz> | 2013-12-20 16:15:39 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-12-20 16:15:39 +0100 |
| commit | 812375fab1517c70f56360719c10c2c61c03180d (patch) | |
| tree | 74cea7b0529e8104d181236947f1e5fadb42c9e9 /src/WorldStorage | |
| parent | Properly fixed warnings in cFastRandom. (diff) | |
| download | cuberite-812375fab1517c70f56360719c10c2c61c03180d.tar cuberite-812375fab1517c70f56360719c10c2c61c03180d.tar.gz cuberite-812375fab1517c70f56360719c10c2c61c03180d.tar.bz2 cuberite-812375fab1517c70f56360719c10c2c61c03180d.tar.lz cuberite-812375fab1517c70f56360719c10c2c61c03180d.tar.xz cuberite-812375fab1517c70f56360719c10c2c61c03180d.tar.zst cuberite-812375fab1517c70f56360719c10c2c61c03180d.zip | |
Diffstat (limited to 'src/WorldStorage')
| -rw-r--r-- | src/WorldStorage/WSSCompact.cpp | 6 | ||||
| -rw-r--r-- | src/WorldStorage/WSSCompact.h | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp index 287938b24..e2556b96e 100644 --- a/src/WorldStorage/WSSCompact.cpp +++ b/src/WorldStorage/WSSCompact.cpp @@ -871,9 +871,9 @@ bool cWSSCompact::LoadChunkFromData(const cChunkCoords & a_Chunk, int & a_Uncomp } BLOCKTYPE * BlockData = (BLOCKTYPE *)UncompressedData.data(); - NIBBLETYPE * MetaData = (NIBBLETYPE *)(BlockData + cChunkDef::MetaOffset); - NIBBLETYPE * BlockLight = (NIBBLETYPE *)(BlockData + cChunkDef::LightOffset); - NIBBLETYPE * SkyLight = (NIBBLETYPE *)(BlockData + cChunkDef::SkyLightOffset); + NIBBLETYPE * MetaData = (NIBBLETYPE *)(BlockData + MetaOffset); + NIBBLETYPE * BlockLight = (NIBBLETYPE *)(BlockData + LightOffset); + NIBBLETYPE * SkyLight = (NIBBLETYPE *)(BlockData + SkyLightOffset); a_World->SetChunkData( a_Chunk.m_ChunkX, a_Chunk.m_ChunkZ, diff --git a/src/WorldStorage/WSSCompact.h b/src/WorldStorage/WSSCompact.h index a75c41ccb..3223a986e 100644 --- a/src/WorldStorage/WSSCompact.h +++ b/src/WorldStorage/WSSCompact.h @@ -58,6 +58,14 @@ public: protected: + enum + { + // Offsets to individual components in the joined blockdata array + MetaOffset = cChunkDef::NumBlocks, + LightOffset = MetaOffset + cChunkDef::NumBlocks / 2, + SkyLightOffset = LightOffset + cChunkDef::NumBlocks / 2, + } ; + struct sChunkHeader; typedef std::vector<sChunkHeader *> sChunkHeaders; |