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/ItemCookedFish.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Items/ItemCookedFish.h') diff --git a/src/Items/ItemCookedFish.h b/src/Items/ItemCookedFish.h index d0edc2d6a..32933e058 100644 --- a/src/Items/ItemCookedFish.h +++ b/src/Items/ItemCookedFish.h @@ -7,19 +7,19 @@ -class cItemCookedFishHandler: +class cItemCookedFishHandler final: public cItemFoodHandler { using Super = cItemFoodHandler; public: - cItemCookedFishHandler(): - Super(E_ITEM_COOKED_FISH, FoodInfo(0, 0)) + constexpr cItemCookedFishHandler(int a_ItemType): + Super(a_ItemType, FoodInfo(0, 0)) { } - virtual FoodInfo GetFoodInfo(const cItem * a_Item) override + virtual FoodInfo GetFoodInfo(const cItem * a_Item) const override { static const FoodInfo CookedFishInfos[] = { -- cgit v1.2.3