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/ItemSoup.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Items/ItemSoup.h') diff --git a/src/Items/ItemSoup.h b/src/Items/ItemSoup.h index 60a2f8d76..974a410a8 100644 --- a/src/Items/ItemSoup.h +++ b/src/Items/ItemSoup.h @@ -8,20 +8,20 @@ -class cItemSoupHandler: +class cItemSoupHandler final: public cItemFoodHandler { using Super = cItemFoodHandler; public: - cItemSoupHandler(int a_ItemType, FoodInfo a_FoodInfo): + constexpr cItemSoupHandler(int a_ItemType, FoodInfo a_FoodInfo): Super(a_ItemType, a_FoodInfo) { } - virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override + virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) const override { // Skip over food handler, which does removal for us. if (!cItemHandler::EatItem(a_Player, a_Item)) -- cgit v1.2.3