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

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

diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index 875fbec02..eaf3e0b44 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -4,24 +4,21 @@
 #include "../Entities/EntityEffect.h"
 
 
-class cItemPotionHandler:
+class cItemPotionHandler final:
 	public cItemHandler
 {
 	using Super = cItemHandler;
 
 public:
 
-	cItemPotionHandler():
-		Super(E_ITEM_POTION)
-	{
-	}
+	using Super::Super;
 
 
 
 
 
 	// cItemHandler overrides:
-	virtual bool IsDrinkable(short a_ItemDamage) override
+	virtual bool IsDrinkable(short a_ItemDamage) const override
 	{
 		// Drinkable potion if 13th lowest bit is set
 		// Ref.: https://minecraft.gamepedia.com/Potions#Data_value_table
@@ -39,7 +36,7 @@ public:
 		const cItem & a_HeldItem,
 		const Vector3i a_ClickedBlockPos,
 		eBlockFace a_ClickedBlockFace
-	) override
+	) const override
 	{
 		short PotionDamage = a_HeldItem.m_ItemDamage;
 
@@ -72,7 +69,7 @@ public:
 
 
 
-	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) const override
 	{
 		short PotionDamage = a_Item->m_ItemDamage;
 
-- 
cgit v1.2.3