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/ItemPickaxe.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/Items/ItemPickaxe.h') diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h index 9172146b7..3c38e372f 100644 --- a/src/Items/ItemPickaxe.h +++ b/src/Items/ItemPickaxe.h @@ -5,14 +5,14 @@ -class cItemPickaxeHandler: +class cItemPickaxeHandler final: public cItemHandler { using Super = cItemHandler; public: - cItemPickaxeHandler(int a_ItemType): + constexpr cItemPickaxeHandler(int a_ItemType): Super(a_ItemType) { @@ -20,7 +20,7 @@ public: - virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) override + virtual short GetDurabilityLossByAction(eDurabilityLostAction a_Action) const override { switch (a_Action) { @@ -33,7 +33,7 @@ public: - char PickaxeLevel() + char PickaxeLevel() const { switch (m_ItemType) { @@ -47,7 +47,7 @@ public: } } - virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) override + virtual bool CanHarvestBlock(BLOCKTYPE a_BlockType) const override { // NOTICE: Make sure to update cItemHandler::CanHarvestBlock() if adding new blocks here! switch (a_BlockType) @@ -155,7 +155,7 @@ public: return Super::CanHarvestBlock(a_BlockType); } - virtual bool CanRepairWithRawMaterial(short a_ItemType) override + virtual bool CanRepairWithRawMaterial(short a_ItemType) const override { switch (m_ItemType) { @@ -169,7 +169,7 @@ public: } - virtual float GetBlockBreakingStrength(BLOCKTYPE a_Block) override + virtual float GetBlockBreakingStrength(BLOCKTYPE a_Block) const override { if (!IsBlockMaterialIron(a_Block) && (a_Block != E_BLOCK_ANVIL) && !IsBlockMaterialRock(a_Block)) { -- cgit v1.2.3