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/ItemChorusFruit.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Items/ItemChorusFruit.h') diff --git a/src/Items/ItemChorusFruit.h b/src/Items/ItemChorusFruit.h index 261088411..d60c2730f 100644 --- a/src/Items/ItemChorusFruit.h +++ b/src/Items/ItemChorusFruit.h @@ -8,19 +8,19 @@ -class cItemChorusFruitHandler: +class cItemChorusFruitHandler final: public cItemFoodHandler { using Super = cItemFoodHandler; public: - cItemChorusFruitHandler(): - Super(E_ITEM_CHORUS_FRUIT, FoodInfo(4, 2.4)) + constexpr cItemChorusFruitHandler(int a_ItemType) : + Super(a_ItemType, FoodInfo(4, 2.4)) { } - virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override + virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) const override { cItemHandler::EatItem(a_Player, a_Item); -- cgit v1.2.3