diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-10 14:49:40 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-10 14:49:40 +0100 |
| commit | e5b91a8d97f1f4af295b001708f434dda5ced983 (patch) | |
| tree | 43cede2ff243c6967beda61c211794c7d0a7db1b | |
| parent | You can change axis ordering by setting AXIS_ORDER to AXIS_ORDER_XZY in cChunk.h !THIS WILL SCREW UP YOUR WORLDS THOUGH! (diff) | |
| download | cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.tar cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.tar.gz cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.tar.bz2 cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.tar.lz cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.tar.xz cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.tar.zst cuberite-e5b91a8d97f1f4af295b001708f434dda5ced983.zip | |
| -rw-r--r-- | source/cChunk.cpp | 2 | ||||
| -rw-r--r-- | source/cChunk.h | 4 | ||||
| -rw-r--r-- | source/cChunk.inl.h | 4 | ||||
| -rw-r--r-- | source/packets/cPacket_MapChunk.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source/cChunk.cpp b/source/cChunk.cpp index f1f7300c6..9d0fc8bdf 100644 --- a/source/cChunk.cpp +++ b/source/cChunk.cpp @@ -541,7 +541,7 @@ void cChunk::Tick(float a_Dt, MTRand & a_TickRandom) {
#if AXIS_ORDER == AXIS_ORDER_YZX
char AboveBlock = GetBlock( Index+1 );
-#else if AXIS_ORDER == AXIS_ORDER_XZY
+#elif AXIS_ORDER == AXIS_ORDER_XZY
char AboveBlock = GetBlock( Index + (c_ChunkWidth*c_ChunkWidth) );
#endif
if (!( (AboveBlock == 0) || (g_BlockOneHitDig[AboveBlock]) || (g_BlockTransparent[AboveBlock]) ) ) //changed to not allow grass if any one hit object is on top
diff --git a/source/cChunk.h b/source/cChunk.h index 85a67b466..9a129ba31 100644 --- a/source/cChunk.h +++ b/source/cChunk.h @@ -240,7 +240,7 @@ public: {
#if AXIS_ORDER == AXIS_ORDER_XZY
return x + (z * c_ChunkWidth) + (y * c_ChunkWidth * c_ChunkWidth); // 1.2 is XZY
- #else if AXIS_ORDER == AXIS_ORDER_YZX
+ #elif AXIS_ORDER == AXIS_ORDER_YZX
return y + (z * c_ChunkHeight) + (x * c_ChunkHeight * c_ChunkWidth); // 1.1 is YZX
#endif
}
@@ -253,7 +253,7 @@ public: index / (c_ChunkWidth * c_ChunkWidth), // Y
(index / c_ChunkWidth) % c_ChunkWidth // Z
);
- #else if AXIS_ORDER == AXIS_ORDER_YZX
+ #elif AXIS_ORDER == AXIS_ORDER_YZX
return Vector3i( // 1.1
index / (c_ChunkHeight * c_ChunkWidth), // X
index % c_ChunkHeight, // Y
diff --git a/source/cChunk.inl.h b/source/cChunk.inl.h index 0f0c25c09..69c3c4bbe 100644 --- a/source/cChunk.inl.h +++ b/source/cChunk.inl.h @@ -40,7 +40,7 @@ char cChunk::GetNibble(char* a_Buffer, int x, int y, int z) const int cindex = MakeIndexNoCheck(x, y, z)/2;
#if AXIS_ORDER == AXIS_ORDER_XZY
if( (x & 1) == 0 )
-#else if AXIS_ORDER == AXIS_ORDER_YZX
+#elif AXIS_ORDER == AXIS_ORDER_YZX
if( (y & 1) == 0 )
#endif
{ // First half byte
@@ -89,7 +89,7 @@ void cChunk::SetNibble(char* a_Buffer, int x, int y, int z, char light) int cindex = MakeIndexNoCheck(x, y, z)/2;
#if AXIS_ORDER == AXIS_ORDER_XZY
if( (x & 1) == 0 )
-#else if AXIS_ORDER == AXIS_ORDER_YZX
+#elif AXIS_ORDER == AXIS_ORDER_YZX
if( (y & 1) == 0 )
#endif
{ // First half byte
diff --git a/source/packets/cPacket_MapChunk.cpp b/source/packets/cPacket_MapChunk.cpp index 037b94396..7e6ec689b 100644 --- a/source/packets/cPacket_MapChunk.cpp +++ b/source/packets/cPacket_MapChunk.cpp @@ -95,7 +95,7 @@ cPacket_MapChunk::cPacket_MapChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, cha }
}
}
-#else if AXIS_ORDER == AXIS_ORDER_XZY
+#elif AXIS_ORDER == AXIS_ORDER_XZY
for ( int i = 0; i < 16; ++i )
{
m_BitMap1 |= (1 << i);
|