diff options
Diffstat (limited to 'src/Inventory.cpp')
| -rw-r--r-- | src/Inventory.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Inventory.cpp b/src/Inventory.cpp index a34d51993..8da3dea5f 100644 --- a/src/Inventory.cpp +++ b/src/Inventory.cpp @@ -102,13 +102,17 @@ int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks, bool a_tryT { cItem ToAdd(a_Item); int res = 0; + + // When the item is a armor, try to set it directly to the armor slot. if (ItemCategory::IsArmor(a_Item.m_ItemType)) { - res = m_ArmorSlots.AddItem(ToAdd, a_AllowNewStacks); - ToAdd.m_ItemCount -= res; - if (ToAdd.m_ItemCount == 0) + for (size_t i = 0; i < (size_t)m_ArmorSlots.GetNumSlots(); i++) { - return res; + if (m_ArmorSlots.GetSlot(i).IsEmpty() && cSlotAreaArmor::CanPlaceArmorInSlot(i, a_Item)) + { + m_ArmorSlots.SetSlot(i, a_Item); + return a_Item.m_ItemCount; + } } } |