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/BlockStairs.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/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); } - - } ; |