From e6a9e6066afc369f01c046de8e3a90a4b042286c Mon Sep 17 00:00:00 2001 From: Jesse McDonald Date: Thu, 18 May 2017 22:56:49 -0500 Subject: Inventory: Make addItem for empty ItemStacks respect max stack size When adding items to an empty ItemStack, limit the number of items taken based on the maximum stack size in the item description. Likewise, when checking whether items will fit into an empty ItemStack, only absorb as many items as are allowed in a single stack and return the rest. --- src/inventory.cpp | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/inventory.cpp b/src/inventory.cpp index 5ce82737a..24eebba80 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -267,8 +267,17 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_, // If this is an empty item, it's an easy job. else if(empty()) { + const u16 stackMax = getStackMax(itemdef); + *this = newitem; - newitem.clear(); + + // If the item fits fully, delete it + if (count <= stackMax) { + newitem.clear(); + } else { // Else the item does not fit fully. Return the rest. + count = stackMax; + newitem.remove(count); + } } // If item name or metadata differs, bail out else if (name != newitem.name @@ -308,7 +317,14 @@ bool ItemStack::itemFits(const ItemStack &newitem_, // If this is an empty item, it's an easy job. else if(empty()) { - newitem.clear(); + const u16 stackMax = getStackMax(itemdef); + + // If the item fits fully, delete it + if (newitem.count <= stackMax) { + newitem.clear(); + } else { // Else the item does not fit fully. Return the rest. + newitem.remove(stackMax); + } } // If item name or metadata differs, bail out else if (name != newitem.name @@ -322,7 +338,6 @@ bool ItemStack::itemFits(const ItemStack &newitem_, newitem.clear(); } // Else the item does not fit fully. Return the rest. - // the rest. else { u16 freespace = freeSpace(itemdef); -- cgit v1.2.3