From a2ecbf6a2e515794cdd02e51780ead5b888a2165 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 23 Sep 2020 16:02:32 +0100 Subject: [PATCH] Fix cItems::AddItemGrid adding empty items --- src/Item.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Item.cpp b/src/Item.cpp index f1177c84a..ca4210c75 100644 --- a/src/Item.cpp +++ b/src/Item.cpp @@ -804,9 +804,12 @@ bool cItems::ContainsType(const cItem & a_Item) void cItems::AddItemGrid(const cItemGrid & a_ItemGrid) { - auto numSlots = a_ItemGrid.GetNumSlots(); - for (int i = 0; i < numSlots; ++i) + for (int i = 0; i < a_ItemGrid.GetNumSlots(); ++i) { - Add(a_ItemGrid.GetSlot(i)); + const auto & Slot = a_ItemGrid.GetSlot(i); + if (!Slot.IsEmpty()) + { + Add(Slot); + } } }