diff options
author | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-20 16:33:04 +0100 |
---|---|---|
committer | Tycho Bickerstaff <work.tycho@gmail.com> | 2013-12-20 16:33:04 +0100 |
commit | 32e6be002d70f8fec486f0127fc307a21f1ff43e (patch) | |
tree | 5601738de3331ff3bfa70bd286784bdd4ba60055 /src/Blocks | |
parent | made LUA shared unless STATIC_LUA is set (diff) | |
parent | Fixed warnings in HTTP parser. (diff) | |
download | cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.tar cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.tar.gz cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.tar.bz2 cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.tar.lz cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.tar.xz cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.tar.zst cuberite-32e6be002d70f8fec486f0127fc307a21f1ff43e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Blocks/BlockCactus.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockDoor.cpp | 8 | ||||
-rw-r--r-- | src/Blocks/BlockPortal.h | 4 | ||||
-rw-r--r-- | src/Blocks/BlockStems.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockSugarcane.h | 2 | ||||
-rw-r--r-- | src/Blocks/BlockVine.h | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h index 7a9088178..f77df5e42 100644 --- a/src/Blocks/BlockCactus.h +++ b/src/Blocks/BlockCactus.h @@ -48,7 +48,7 @@ public: { 0, -1}, { 0, 1}, } ; - for (int i = 0; i < ARRAYCOUNT(Coords); i++) + for (size_t i = 0; i < ARRAYCOUNT(Coords); i++) { BLOCKTYPE BlockType; NIBBLETYPE BlockMeta; diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp index e71ccd368..e91211559 100644 --- a/src/Blocks/BlockDoor.cpp +++ b/src/Blocks/BlockDoor.cpp @@ -65,10 +65,10 @@ void cBlockDoorHandler::OnPlacedByPlayer( { NIBBLETYPE a_TopBlockMeta = 8; if ( - (a_BlockMeta == 0) && (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ - 1) == m_BlockType) || - (a_BlockMeta == 1) && (a_World->GetBlock(a_BlockX + 1, a_BlockY, a_BlockZ) == m_BlockType) || - (a_BlockMeta == 2) && (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ + 1) == m_BlockType) || - (a_BlockMeta == 3) && (a_World->GetBlock(a_BlockX - 1, a_BlockY, a_BlockZ) == m_BlockType) + ((a_BlockMeta == 0) && (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ - 1) == m_BlockType)) || + ((a_BlockMeta == 1) && (a_World->GetBlock(a_BlockX + 1, a_BlockY, a_BlockZ) == m_BlockType)) || + ((a_BlockMeta == 2) && (a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ + 1) == m_BlockType)) || + ((a_BlockMeta == 3) && (a_World->GetBlock(a_BlockX - 1, a_BlockY, a_BlockZ) == m_BlockType)) ) { a_TopBlockMeta = 9; diff --git a/src/Blocks/BlockPortal.h b/src/Blocks/BlockPortal.h index c56f0cbc8..d88d14fc9 100644 --- a/src/Blocks/BlockPortal.h +++ b/src/Blocks/BlockPortal.h @@ -61,7 +61,7 @@ public: {-1, 0, 0}, } ; - for (int i = 0; i < ARRAYCOUNT(PortalCheck); i++) + for (size_t i = 0; i < ARRAYCOUNT(PortalCheck); i++) { BLOCKTYPE Block; a_Chunk.UnboundedRelGetBlockType(a_RelX + PortalCheck[i].x, a_RelY + PortalCheck[i].y, a_RelZ + PortalCheck[i].z, Block); @@ -86,7 +86,7 @@ public: { 0, 0, 1}, } ; - for (int i = 0; i < ARRAYCOUNT(PortalCheck); i++) + for (size_t i = 0; i < ARRAYCOUNT(PortalCheck); i++) { BLOCKTYPE Block; a_Chunk.UnboundedRelGetBlockType(a_RelX + PortalCheck[i].x, a_RelY + PortalCheck[i].y, a_RelZ + PortalCheck[i].z, Block); diff --git a/src/Blocks/BlockStems.h b/src/Blocks/BlockStems.h index c2dff62cf..d860639a5 100644 --- a/src/Blocks/BlockStems.h +++ b/src/Blocks/BlockStems.h @@ -32,7 +32,7 @@ public: // Grow the produce: int BlockX = a_RelX + a_Chunk.GetPosX() * cChunkDef::Width; int BlockZ = a_RelZ + a_Chunk.GetPosZ() * cChunkDef::Width; - a_Chunk.GetWorld()->GrowMelonPumpkin(BlockX, a_RelY, a_RelZ, m_BlockType); + a_Chunk.GetWorld()->GrowMelonPumpkin(BlockX, a_RelY, BlockZ, m_BlockType); } else { diff --git a/src/Blocks/BlockSugarcane.h b/src/Blocks/BlockSugarcane.h index 02d7a2fe4..9cff94800 100644 --- a/src/Blocks/BlockSugarcane.h +++ b/src/Blocks/BlockSugarcane.h @@ -47,7 +47,7 @@ public: { 0, 1}, } ; a_RelY -= 1; - for (int i = 0; i < ARRAYCOUNT(Coords); i++) + for (size_t i = 0; i < ARRAYCOUNT(Coords); i++) { BLOCKTYPE BlockType; NIBBLETYPE BlockMeta; diff --git a/src/Blocks/BlockVine.h b/src/Blocks/BlockVine.h index 2c9f67cab..60aaa9e4b 100644 --- a/src/Blocks/BlockVine.h +++ b/src/Blocks/BlockVine.h @@ -89,7 +89,7 @@ public: { 1, 0, 8}, // east, XP } ; int res = 0; - for (int i = 0; i < ARRAYCOUNT(Coords); i++) + for (size_t i = 0; i < ARRAYCOUNT(Coords); i++) { BLOCKTYPE BlockType; NIBBLETYPE BlockMeta; |