diff options
| author | Mattes D <github@xoft.cz> | 2014-08-20 16:23:31 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-08-20 16:23:31 +0200 |
| commit | 5410a36f92c1c94f25552dff4a46b9611f0cb917 (patch) | |
| tree | 920627577c09fd3270b08bab3e7a6d3d29d52025 /src/Blocks/BlockTrapdoor.h | |
| parent | Player: Silenced a few type conversion warnings. (diff) | |
| parent | Removed old classes from the CMakeLists.txt (diff) | |
| download | cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.gz cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.bz2 cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.lz cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.xz cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.tar.zst cuberite-5410a36f92c1c94f25552dff4a46b9611f0cb917.zip | |
Diffstat (limited to 'src/Blocks/BlockTrapdoor.h')
| -rw-r--r-- | src/Blocks/BlockTrapdoor.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Blocks/BlockTrapdoor.h b/src/Blocks/BlockTrapdoor.h index 6a36ab874..a6327b5c2 100644 --- a/src/Blocks/BlockTrapdoor.h +++ b/src/Blocks/BlockTrapdoor.h @@ -23,7 +23,7 @@ public: virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { - // Reset meta to 0 + // Reset meta to zero a_Pickups.push_back(cItem(m_BlockType, 1, 0)); } @@ -53,7 +53,7 @@ public: int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) override { a_BlockType = m_BlockType; a_BlockMeta = BlockFaceToMetaData(a_BlockFace); @@ -103,9 +103,10 @@ public: a_Chunk.UnboundedRelGetBlockMeta(a_RelX, a_RelY, a_RelZ, Meta); AddFaceDirection(a_RelX, a_RelY, a_RelZ, BlockMetaDataToBlockFace(Meta), true); - BLOCKTYPE BlockIsOn; a_Chunk.UnboundedRelGetBlockType(a_RelX, a_RelY, a_RelZ, BlockIsOn); + BLOCKTYPE BlockIsOn; + a_Chunk.UnboundedRelGetBlockType(a_RelX, a_RelY, a_RelZ, BlockIsOn); - return (a_RelY > 0) && cBlockInfo::IsSolid(BlockIsOn); + return ((a_RelY > 0) && cBlockInfo::IsSolid(BlockIsOn)); } }; |