diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-07-18 23:11:59 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-07-18 23:11:59 +0200 |
commit | 51b91befbd26b630cd2cecaec081edd03edfb5f3 (patch) | |
tree | 7e34efa7eddbfc0041224b9bd15af415c099ab72 /src/ItemGrid.cpp | |
parent | Monster fixes (diff) | |
download | cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.tar cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.tar.gz cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.tar.bz2 cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.tar.lz cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.tar.xz cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.tar.zst cuberite-51b91befbd26b630cd2cecaec081edd03edfb5f3.zip |
Diffstat (limited to 'src/ItemGrid.cpp')
-rw-r--r-- | src/ItemGrid.cpp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/ItemGrid.cpp b/src/ItemGrid.cpp index cd36b1f2a..38829cbf8 100644 --- a/src/ItemGrid.cpp +++ b/src/ItemGrid.cpp @@ -345,6 +345,39 @@ int cItemGrid::AddItems(cItems & a_ItemStackList, bool a_AllowNewStacks, int a_P +int cItemGrid::RemoveItem(const cItem & a_ItemStack) +{ + int NumLeft = a_ItemStack.m_ItemCount; + + for (int i = 0; i < m_NumSlots; i++) + { + if (NumLeft <= 0) + { + break; + } + + if (m_Slots[i].IsEqual(a_ItemStack)) + { + int NumToRemove = std::min(NumLeft, (int)m_Slots[i].m_ItemCount); + NumLeft -= NumToRemove; + m_Slots[i].m_ItemCount -= NumToRemove; + + if (m_Slots[i].m_ItemCount <= 0) + { + m_Slots[i].Empty(); + } + + TriggerListeners(i); + } + } + + return (a_ItemStack.m_ItemCount - NumLeft); +} + + + + + int cItemGrid::ChangeSlotCount(int a_SlotNum, int a_AddToCount) { if ((a_SlotNum < 0) || (a_SlotNum >= m_NumSlots)) |