flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Empty buckets replace fluid buckets on use and vice versa (patch contributed by Mgueydan)

Browse Source 
Fixes FS #277.
API change: added an optional parameter to cItemGrid:AddItem(), cItemGrid:AddItems(), cInventory:AddItem() and cInventory:AddItems()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1643 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft
2013-07-03 13:56:11 +00:00
parent 504f6192f7
commit e27a5db409
6 changed files with 74 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/Inventory.cpp
View File

@@ -98,7 +98,7 @@ int cInventory::HowManyCanFit(const cItem & a_ItemStack, int a_BeginSlotNum, int
int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks)
int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks, bool a_tryToFillEquippedFirst)
{
cItem ToAdd(a_Item);
int res = 0;
@@ -112,7 +112,7 @@ int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks)
}
}
res += m_HotbarSlots.AddItem(ToAdd, a_AllowNewStacks);
res += m_HotbarSlots.AddItem(ToAdd, a_AllowNewStacks, a_tryToFillEquippedFirst ? m_EquippedSlotNum : -1);
ToAdd.m_ItemCount = a_Item.m_ItemCount - res;
if (ToAdd.m_ItemCount == 0)
{
@@ -127,12 +127,12 @@ int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks)
int cInventory::AddItems(cItems & a_ItemStackList, bool a_AllowNewStacks)
int cInventory::AddItems(cItems & a_ItemStackList, bool a_AllowNewStacks, bool a_tryToFillEquippedFirst)
{
int TotalAdded = 0;
for (cItems::iterator itr = a_ItemStackList.begin(); itr != a_ItemStackList.end();)
{
int NumAdded = AddItem(*itr, a_AllowNewStacks);
int NumAdded = AddItem(*itr, a_AllowNewStacks, a_tryToFillEquippedFirst);
if (itr->m_ItemCount == NumAdded)
{
itr = a_ItemStackList.erase(itr);