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/ItemArmor.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/Items/ItemArmor.h') diff --git a/src/Items/ItemArmor.h b/src/Items/ItemArmor.h index 3139c09f4..eb7e31c79 100644 --- a/src/Items/ItemArmor.h +++ b/src/Items/ItemArmor.h @@ -8,17 +8,14 @@ -class cItemArmorHandler: +class cItemArmorHandler final : public cItemHandler { using Super = cItemHandler; public: - cItemArmorHandler(int a_ItemType): - Super(a_ItemType) - { - } + using Super::Super; @@ -32,7 +29,7 @@ public: const cItem & a_HeldItem, const Vector3i a_ClickedBlockPos, eBlockFace a_ClickedBlockFace - ) override + ) const override { int SlotNum; if (ItemCategory::IsHelmet(a_HeldItem.m_ItemType)) @@ -71,7 +68,7 @@ public: - virtual bool CanRepairWithRawMaterial(short a_ItemType) override + virtual bool CanRepairWithRawMaterial(short a_ItemType) const override { switch (m_ItemType) { -- cgit v1.2.3