diff options
Diffstat (limited to 'src/Blocks/BlockCactus.h')
| -rw-r--r-- | src/Blocks/BlockCactus.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h index 15d585eac..64feac77d 100644 --- a/src/Blocks/BlockCactus.h +++ b/src/Blocks/BlockCactus.h @@ -14,14 +14,9 @@ class cBlockCactusHandler : public: - cBlockCactusHandler(BLOCKTYPE a_BlockType): - Super(a_BlockType) - { - } - - - + using Super::Super; +private: /** Called before a cactus block is placed by a player, overrides cItemHandler::GetPlacementBlockTypeMeta(). Calls CanBeAt function to determine if a cactus block can be placed on a given block. */ @@ -32,7 +27,7 @@ public: eBlockFace a_ClickedBlockFace, const Vector3i a_CursorPos, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) const override { if ( a_Player.GetWorld()->DoWithChunkAt(a_PlacedBlockPos, @@ -57,7 +52,7 @@ public: - virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, const Vector3i a_RelPos, const cChunk & a_Chunk) override + virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, const Vector3i a_RelPos, const cChunk & a_Chunk) const override { if (a_RelPos.y <= 0) { @@ -102,7 +97,7 @@ public: - virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override { UNUSED(a_Meta); return 7; @@ -111,7 +106,7 @@ public: - virtual int Grow(cChunk & a_Chunk, Vector3i a_RelPos, int a_NumStages = 1) override + virtual int Grow(cChunk & a_Chunk, Vector3i a_RelPos, int a_NumStages = 1) const override { // Check the total height of the cacti blocks here: int top = a_RelPos.y + 1; @@ -179,13 +174,7 @@ public: return numToGrow; } - - - - -protected: - - virtual PlantAction CanGrow(cChunk & a_Chunk, Vector3i a_RelPos) override + virtual PlantAction CanGrow(cChunk & a_Chunk, Vector3i a_RelPos) const override { // Only allow growing if there's an air block above: if (((a_RelPos.y + 1) < cChunkDef::Height) && (a_Chunk.GetBlock(a_RelPos.addedY(1)) == E_BLOCK_AIR)) |