diff options
Diffstat (limited to 'src/Blocks/BlockCactus.h')
| -rw-r--r-- | src/Blocks/BlockCactus.h | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/Blocks/BlockCactus.h b/src/Blocks/BlockCactus.h index 371402423..f33c17153 100644 --- a/src/Blocks/BlockCactus.h +++ b/src/Blocks/BlockCactus.h @@ -8,21 +8,31 @@ class cBlockCactusHandler : - public cBlockPlant + public cBlockPlant<false> { - typedef cBlockPlant Super; + using super = cBlockPlant<false>; + public: - cBlockCactusHandler(BLOCKTYPE a_BlockType) - : Super(a_BlockType, false) + + cBlockCactusHandler(BLOCKTYPE a_BlockType): + super(a_BlockType) { } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + + + + + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override { // Reset meta to 0 - a_Pickups.push_back(cItem(m_BlockType, 1, 0)); + return cItem(m_BlockType, 1, 0); } + + + + virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, int a_RelX, int a_RelY, int a_RelZ, const cChunk & a_Chunk) override { if (a_RelY <= 0) @@ -88,7 +98,7 @@ protected: auto Action = paStay; if (((a_RelY + 1) < cChunkDef::Height) && (a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ) == E_BLOCK_AIR)) { - Action = Super::CanGrow(a_Chunk, a_RelX, a_RelY, a_RelZ); + Action = super::CanGrow(a_Chunk, a_RelX, a_RelY, a_RelZ); } return Action; |