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/ItemRawFish.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/Items/ItemRawFish.h')

diff --git a/src/Items/ItemRawFish.h b/src/Items/ItemRawFish.h
index 22836272f..e741aa3e0 100644
--- a/src/Items/ItemRawFish.h
+++ b/src/Items/ItemRawFish.h
@@ -7,19 +7,19 @@
 
 
 
-class cItemRawFishHandler:
+class cItemRawFishHandler final:
 	public cItemFoodHandler
 {
 	using Super = cItemFoodHandler;
 
 public:
 
-	cItemRawFishHandler():
-		Super(E_ITEM_RAW_FISH, FoodInfo(0, 0))
+	constexpr cItemRawFishHandler(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 RawFishInfos[] =
 		{
@@ -37,7 +37,7 @@ public:
 		return RawFishInfos[a_Item->m_ItemDamage];
 	}
 
-	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) const override
 	{
 		if (!Super::EatItem(a_Player, a_Item))
 		{
-- 
cgit v1.2.3