flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Was using "#else if" which is not valid apparently, now using "#elif"

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@391 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth 2012-03-10 13:49:40 +00:00
parent 68f3ea56bd
commit e5b91a8d97
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/cChunk.cpp
View File

@ -541,7 +541,7 @@ void cChunk::Tick(float a_Dt, MTRand & a_TickRandom)
{ {
#if AXIS_ORDER == AXIS_ORDER_YZX #if AXIS_ORDER == AXIS_ORDER_YZX
char AboveBlock = GetBlock( Index+1 ); 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) ); char AboveBlock = GetBlock( Index + (c_ChunkWidth*c_ChunkWidth) );
#endif #endif
if (!( (AboveBlock == 0) || (g_BlockOneHitDig[AboveBlock]) || (g_BlockTransparent[AboveBlock]) ) ) //changed to not allow grass if any one hit object is on top if (!( (AboveBlock == 0) || (g_BlockOneHitDig[AboveBlock]) || (g_BlockTransparent[AboveBlock]) ) ) //changed to not allow grass if any one hit object is on top

4
source/cChunk.h
View File

@ -240,7 +240,7 @@ public:
{ {
#if AXIS_ORDER == AXIS_ORDER_XZY #if AXIS_ORDER == AXIS_ORDER_XZY
return x + (z * c_ChunkWidth) + (y * c_ChunkWidth * c_ChunkWidth); // 1.2 is 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 return y + (z * c_ChunkHeight) + (x * c_ChunkHeight * c_ChunkWidth); // 1.1 is YZX
#endif #endif
} }
@ -253,7 +253,7 @@ public:
index / (c_ChunkWidth * c_ChunkWidth), // Y index / (c_ChunkWidth * c_ChunkWidth), // Y
(index / c_ChunkWidth) % c_ChunkWidth // Z (index / c_ChunkWidth) % c_ChunkWidth // Z
); );
#else if AXIS_ORDER == AXIS_ORDER_YZX #elif AXIS_ORDER == AXIS_ORDER_YZX
return Vector3i( // 1.1 return Vector3i( // 1.1
index / (c_ChunkHeight * c_ChunkWidth), // X index / (c_ChunkHeight * c_ChunkWidth), // X
index % c_ChunkHeight, // Y index % c_ChunkHeight, // Y

4
source/cChunk.inl.h
View File

@ -40,7 +40,7 @@ char cChunk::GetNibble(char* a_Buffer, int x, int y, int z)
const int cindex = MakeIndexNoCheck(x, y, z)/2; const int cindex = MakeIndexNoCheck(x, y, z)/2;
#if AXIS_ORDER == AXIS_ORDER_XZY #if AXIS_ORDER == AXIS_ORDER_XZY
if( (x & 1) == 0 ) if( (x & 1) == 0 )
#else if AXIS_ORDER == AXIS_ORDER_YZX #elif AXIS_ORDER == AXIS_ORDER_YZX
if( (y & 1) == 0 ) if( (y & 1) == 0 )
#endif #endif
{ // First half byte { // 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; int cindex = MakeIndexNoCheck(x, y, z)/2;
#if AXIS_ORDER == AXIS_ORDER_XZY #if AXIS_ORDER == AXIS_ORDER_XZY
if( (x & 1) == 0 ) if( (x & 1) == 0 )
#else if AXIS_ORDER == AXIS_ORDER_YZX #elif AXIS_ORDER == AXIS_ORDER_YZX
if( (y & 1) == 0 ) if( (y & 1) == 0 )
#endif #endif
{ // First half byte { // First half byte

2
source/packets/cPacket_MapChunk.cpp
View File

@ -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 ) for ( int i = 0; i < 16; ++i )
{ {
m_BitMap1 |= (1 << i); m_BitMap1 |= (1 << i);