diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-05 16:56:31 +0200 |
| commit | 28f66efe307150558f4ad2546e058370a828be3e (patch) | |
| tree | 2ef088aa2d1a8ae85007b34b463d5044847bf006 /src/Blocks/BlockSlab.h | |
| parent | Merge branch 'master' into ComponentRewrite (diff) | |
| download | cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.gz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.bz2 cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.lz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.xz cuberite-28f66efe307150558f4ad2546e058370a828be3e.tar.zst cuberite-28f66efe307150558f4ad2546e058370a828be3e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Blocks/BlockSlab.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Blocks/BlockSlab.h b/src/Blocks/BlockSlab.h index 611b7653b..e67f0e8b3 100644 --- a/src/Blocks/BlockSlab.h +++ b/src/Blocks/BlockSlab.h @@ -25,7 +25,7 @@ public: } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/ + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { a_Pickups.push_back(cItem(m_BlockType, 1, a_BlockMeta & 0x7)); } @@ -36,7 +36,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; NIBBLETYPE Meta = (NIBBLETYPE) a_Player->GetEquippedItem().m_ItemDamage; @@ -87,7 +87,7 @@ public: } - virtual const char * GetStepSound(void) /*override*/ + virtual const char * GetStepSound(void) override { switch (m_BlockType) { @@ -99,7 +99,7 @@ public: } - virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) /*override*/ + virtual bool CanDirtGrowGrass(NIBBLETYPE a_Meta) override { return ((a_Meta & 0x8) != 0); } @@ -112,7 +112,7 @@ public: } - virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) /*override*/ + virtual void OnCancelRightClick(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace) override { if ((a_BlockFace == BLOCK_FACE_NONE) || (a_Player->GetEquippedItem().m_ItemType != (short)m_BlockType)) { @@ -137,7 +137,7 @@ public: } - virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) /*override*/ + virtual NIBBLETYPE MetaMirrorXZ(NIBBLETYPE a_Meta) override { // Toggle the 4th bit - up / down: return (a_Meta ^ 0x08); @@ -158,7 +158,7 @@ public: } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) /*override*/ + virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override { BLOCKTYPE Block = GetSingleSlabType(m_BlockType); a_Pickups.push_back(cItem(Block, 2, a_BlockMeta & 0x7)); @@ -175,7 +175,7 @@ public: return a_BlockType; } - virtual const char * GetStepSound(void) /*override*/ + virtual const char * GetStepSound(void) override { switch (m_BlockType) { |