diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-08-19 22:14:37 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-08-19 22:14:37 +0200 |
commit | b5ffe06f884221f98407910bdd30baf533d84970 (patch) | |
tree | 6f7768641979fa5f57525eb98e8a7e37b71bfe06 /src/Blocks/BlockStairs.h | |
parent | Player: Silenced a few type conversion warnings. (diff) | |
download | cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.gz cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.bz2 cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.lz cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.xz cuberite-b5ffe06f884221f98407910bdd30baf533d84970.tar.zst cuberite-b5ffe06f884221f98407910bdd30baf533d84970.zip |
Diffstat (limited to 'src/Blocks/BlockStairs.h')
-rw-r--r-- | src/Blocks/BlockStairs.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Blocks/BlockStairs.h b/src/Blocks/BlockStairs.h index a7ccf1714..417969a82 100644 --- a/src/Blocks/BlockStairs.h +++ b/src/Blocks/BlockStairs.h @@ -16,8 +16,8 @@ public: { } - - + + virtual bool GetPlacementBlockTypeMeta( cChunkInterface & a_ChunkInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, @@ -53,8 +53,8 @@ public: } return true; } - - + + virtual const char * GetStepSound(void) override { if ( @@ -64,7 +64,7 @@ public: (m_BlockType == E_BLOCK_ACACIA_WOOD_STAIRS) || (m_BlockType == E_BLOCK_BIRCH_WOOD_STAIRS) || (m_BlockType == E_BLOCK_DARK_OAK_WOOD_STAIRS) - ) + ) { return "step.wood"; } @@ -72,17 +72,20 @@ public: return "step.stone"; } + 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)); } + virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override { return true; } - + + static NIBBLETYPE RotationToMetaData(double a_Rotation) { a_Rotation += 90 + 45; // So its not aligned with axis @@ -108,14 +111,11 @@ public: } } - virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override { // Toggle bit 3: return (a_Meta & 0x0b) | ((~a_Meta) & 0x04); } - - } ; |