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

Fix building with clang 8.0 (#4346)

Browse Source
This commit is contained in:
Bond-009
2019-08-11 10:39:43 +01:00
committed by peterbell10
parent 4de232bdae
commit e0ca4d8399
20 changed files with 95 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Blocks/BlockLeaves.h
+9 -7
View File
@@ -11,13 +11,15 @@
#define LEAVES_CHECK_DISTANCE 6
#define PROCESS_NEIGHBOR(x, y, z) \
switch (a_Area.GetBlockType(x, y, z)) \
{ \
case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, static_cast<BLOCKTYPE>(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_LOG: return true; \
case E_BLOCK_NEW_LEAVES: a_Area.SetBlockType(x, y, z, static_cast<BLOCKTYPE>(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_NEW_LOG: return true; \
}
do { \
switch (a_Area.GetBlockType(x, y, z)) \
{ \
case E_BLOCK_LEAVES: a_Area.SetBlockType(x, y, z, static_cast<BLOCKTYPE>(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_LOG: return true; \
case E_BLOCK_NEW_LEAVES: a_Area.SetBlockType(x, y, z, static_cast<BLOCKTYPE>(E_BLOCK_SPONGE + i + 1)); break; \
case E_BLOCK_NEW_LOG: return true; \
} \
} while (false)
bool HasNearLog(cBlockArea &a_Area, int a_BlockX, int a_BlockY, int a_BlockZ);
src/Blocks/BlockTorch.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
ASSERT(!"Unhandled torch direction!");
break;
}
};
}
return 0x0;
}