diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 19:30:31 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-22 19:30:31 +0200 |
| commit | 18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2 (patch) | |
| tree | 089b3be905aa030367925762c58bd30b08f5f3f6 /src/ChunkDef.h | |
| parent | Merge branch 'master' into saplingsandleaves (diff) | |
| parent | Updated prefabs to current Gallery content. (diff) | |
| download | cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.gz cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.bz2 cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.lz cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.xz cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.tar.zst cuberite-18a0b60c12daec4c04fd3cb9c4422e69de4fcbf2.zip | |
Diffstat (limited to 'src/ChunkDef.h')
| -rw-r--r-- | src/ChunkDef.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ChunkDef.h b/src/ChunkDef.h index 334f8a6b9..dbb782d26 100644 --- a/src/ChunkDef.h +++ b/src/ChunkDef.h @@ -92,7 +92,7 @@ public: /// Converts absolute block coords into relative (chunk + block) coords: - inline static void AbsoluteToRelative(/* in-out */ int & a_X, int & a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ ) + inline static void AbsoluteToRelative(/* in-out */ int & a_X, int & a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ) { UNUSED(a_Y); BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ); @@ -118,7 +118,7 @@ public: } - inline static int MakeIndex(int x, int y, int z ) + inline static int MakeIndex(int x, int y, int z) { if ( (x < Width) && (x > -1) && @@ -145,7 +145,7 @@ public: } - inline static Vector3i IndexToCoordinate( unsigned int index ) + inline static Vector3i IndexToCoordinate( unsigned int index) { #if AXIS_ORDER == AXIS_ORDER_XZY return Vector3i( // 1.2 @@ -357,7 +357,7 @@ struct sSetBlock BLOCKTYPE BlockType; NIBBLETYPE BlockMeta; - sSetBlock( int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta ); // absolute block position + sSetBlock( int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta); // absolute block position sSetBlock(int a_ChunkX, int a_ChunkZ, int a_X, int a_Y, int a_Z, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) : x(a_X), y(a_Y), z(a_Z), ChunkX(a_ChunkX), ChunkZ(a_ChunkZ), |