From 3ff57559e36d3254c64e334fbe3bdd47398fe16f Mon Sep 17 00:00:00 2001 From: x12xx12x <44411062+12xx12@users.noreply.github.com> Date: Thu, 2 Dec 2021 00:31:10 +0100 Subject: ItemHandler initialisation is a constant expression (#5344) * Transition to non-pointer item handler * That is my destructor - I decide when I leave this world * I declare your destruction private and you final --- src/Items/ItemShears.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'src/Items/ItemShears.h') diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h index 140e26c5e..5f8e9e2f1 100644 --- a/src/Items/ItemShears.h +++ b/src/Items/ItemShears.h @@ -9,26 +9,14 @@ -class cItemShearsHandler: +class cItemShearsHandler final: public cItemHandler { using Super = cItemHandler; public: - cItemShearsHandler(int a_ItemType): - Super(a_ItemType) - { - } - - - - - - virtual bool IsTool(void) override - { - return true; - } + using Super::Super; @@ -40,7 +28,7 @@ public: const cItem & a_HeldItem, const Vector3i a_ClickedBlockPos, eBlockFace a_ClickedBlockFace - ) override + ) const override { BLOCKTYPE Block; NIBBLETYPE BlockMeta; @@ -59,7 +47,7 @@ public: - virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override + virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) const override { switch (a_BlockType) { @@ -77,7 +65,7 @@ public: - virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) const override { switch (a_Action) { @@ -92,7 +80,7 @@ public: - virtual float GetBlockBreakingStrength(BLOCKTYPE a_Block) override + virtual float GetBlockBreakingStrength(BLOCKTYPE a_Block) const override { if ((a_Block == E_BLOCK_COBWEB) || IsBlockMaterialLeaves(a_Block)) { -- cgit v1.2.3