diff options
| author | Mattes D <github@xoft.cz> | 2014-05-08 20:16:35 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-05-08 20:16:35 +0200 |
| commit | c4ea25e136026004526a63516cbed498e2b6fabe (patch) | |
| tree | 41545a10b134ea1fc6e58913fc71c4695cdc8297 /src/Blocks | |
| parent | Merge pull request #989 from Howaner/Anvil (diff) | |
| download | cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.tar cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.tar.gz cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.tar.bz2 cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.tar.lz cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.tar.xz cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.tar.zst cuberite-c4ea25e136026004526a63516cbed498e2b6fabe.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockFarmland.h | 4 | ||||
| -rw-r--r-- | src/Blocks/BlockLeaves.h | 6 | ||||
| -rw-r--r-- | src/Blocks/BlockSlab.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h index b720ccd14..3dd5bcd1d 100644 --- a/src/Blocks/BlockFarmland.h +++ b/src/Blocks/BlockFarmland.h @@ -52,9 +52,9 @@ public: return; } - int NumBlocks = Area.GetBlockCount(); + size_t NumBlocks = Area.GetBlockCount(); BLOCKTYPE * BlockTypes = Area.GetBlockTypes(); - for (int i = 0; i < NumBlocks; i++) + for (size_t i = 0; i < NumBlocks; i++) { if ( (BlockTypes[i] == E_BLOCK_WATER) || diff --git a/src/Blocks/BlockLeaves.h b/src/Blocks/BlockLeaves.h index d21227b07..495e849fa 100644 --- a/src/Blocks/BlockLeaves.h +++ b/src/Blocks/BlockLeaves.h @@ -138,14 +138,14 @@ bool HasNearLog(cBlockArea & a_Area, int a_BlockX, int a_BlockY, int a_BlockZ) { // Filter the blocks into a {leaves, log, other (air)} set: BLOCKTYPE * Types = a_Area.GetBlockTypes(); - for (int i = a_Area.GetBlockCount() - 1; i > 0; i--) + for (size_t i = a_Area.GetBlockCount() - 1; i > 0; i--) { switch (Types[i]) { - case E_BLOCK_NEW_LEAVES: - case E_BLOCK_NEW_LOG: case E_BLOCK_LEAVES: case E_BLOCK_LOG: + case E_BLOCK_NEW_LEAVES: + case E_BLOCK_NEW_LOG: { break; } diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h index b6bd12588..80841b094 100644 --- a/src/Blocks/BlockSlab.h +++ b/src/Blocks/BlockSlab.h @@ -100,7 +100,7 @@ public: virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override { - return (a_Meta & 0x8); + return ((a_Meta & 0x8) != 0); } |