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/Item.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Item.cpp') diff --git a/src/Item.cpp b/src/Item.cpp index ba2a8db90..198912aa4 100644 --- a/src/Item.cpp +++ b/src/Item.cpp @@ -197,7 +197,7 @@ bool cItem::DamageItem(short a_Amount) bool cItem::IsFullStack(void) const { - return (m_ItemCount >= ItemHandler(m_ItemType)->GetMaxStackSize()); + return (m_ItemCount >= GetMaxStackSize()); } @@ -206,16 +206,16 @@ bool cItem::IsFullStack(void) const char cItem::GetMaxStackSize(void) const { - return ItemHandler(m_ItemType)->GetMaxStackSize(); + return cItemHandler::For(m_ItemType).GetMaxStackSize(); } -cItemHandler * cItem::GetHandler(void) const +const cItemHandler & cItem::GetHandler(void) const { - return ItemHandler(m_ItemType); + return cItemHandler::For(m_ItemType); } -- cgit v1.2.3