diff options
author | madmaxoft <github@xoft.cz> | 2014-07-17 16:33:09 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-07-17 16:33:09 +0200 |
commit | 993fd14ddfc881cf5be951df77da0338124d68cc (patch) | |
tree | 828cd0c784698ca4533aeaf2592d9fed75fe55a3 /src/ChunkDef.h | |
parent | Merge pull request #1183 from Howaner/Sounds (diff) | |
download | cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.gz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.bz2 cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.lz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.xz cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.tar.zst cuberite-993fd14ddfc881cf5be951df77da0338124d68cc.zip |
Diffstat (limited to '')
-rw-r--r-- | src/ChunkDef.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ChunkDef.h b/src/ChunkDef.h index f89e16ed1..bd6387b74 100644 --- a/src/ChunkDef.h +++ b/src/ChunkDef.h @@ -22,8 +22,8 @@ It will help us when the new chunk format comes out and we need to patch everyth #define ZERO_CHUNK_Y 0 // Used to smoothly convert to new axis ordering. One will be removed when deemed stable. -#define AXIS_ORDER_YZX 1 // Original (1.1-) -#define AXIS_ORDER_XZY 2 // New (1.2+) +#define AXIS_ORDER_YZX 1 // Original (1.1-) +#define AXIS_ORDER_XZY 2 // New (1.2+) #define AXIS_ORDER AXIS_ORDER_XZY @@ -72,7 +72,7 @@ public: /// The type used for any heightmap operations and storage; idx = x + Width * z; Height points to the highest non-air block in the column typedef HEIGHTTYPE HeightMap[Width * Width]; - /** The type used for any biomemap operations and storage inside MCServer, + /** The type used for any biomemap operations and storage inside MCServer, using MCServer biomes (need not correspond to client representation!) idx = x + Width * z // Need to verify this with the protocol spec, currently unknown! */ @@ -148,17 +148,17 @@ public: inline static Vector3i IndexToCoordinate( unsigned int index ) { #if AXIS_ORDER == AXIS_ORDER_XZY - return Vector3i( // 1.2 - index % cChunkDef::Width, // X - index / (cChunkDef::Width * cChunkDef::Width), // Y - (index / cChunkDef::Width) % cChunkDef::Width // Z - ); + return Vector3i( // 1.2 + index % cChunkDef::Width, // X + index / (cChunkDef::Width * cChunkDef::Width), // Y + (index / cChunkDef::Width) % cChunkDef::Width // Z + ); #elif AXIS_ORDER == AXIS_ORDER_YZX - return Vector3i( // 1.1 - index / (cChunkDef::Height * cChunkDef::Width), // X - index % cChunkDef::Height, // Y - (index / cChunkDef::Height) % cChunkDef::Width // Z - ); + return Vector3i( // 1.1 + index / (cChunkDef::Height * cChunkDef::Width), // X + index % cChunkDef::Height, // Y + (index / cChunkDef::Height) % cChunkDef::Width // Z + ); #endif } |