diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-05-18 15:30:16 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-05-18 15:30:16 +0200 |
commit | 0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9 (patch) | |
tree | dc5046599788117404826792986eb073ef3b27db /src/Inventory.h | |
parent | Merge branch 'master' of https://github.com/mc-server/MCServer (diff) | |
download | cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.tar cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.tar.gz cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.tar.bz2 cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.tar.lz cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.tar.xz cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.tar.zst cuberite-0dbba305b6b96f81fe5f9b457dfb4f63d4a420c9.zip |
Diffstat (limited to 'src/Inventory.h')
-rw-r--r-- | src/Inventory.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/Inventory.h b/src/Inventory.h index b2a8f658b..5501399bd 100644 --- a/src/Inventory.h +++ b/src/Inventory.h @@ -70,23 +70,17 @@ public: /** Adds as many items out of a_ItemStack as can fit. If a_AllowNewStacks is set to false, only existing stacks can be topped up; if a_AllowNewStacks is set to true, empty slots can be used for the rest. - If a_tryToFillEquippedFirst is set to true, the currently equipped slot will be used first (if empty or - compatible with added items) - if a_tryToFillEquippedFirst is set to false, the regular order applies. Returns the number of items that fit. */ - int AddItem(const cItem & a_ItemStack, bool a_AllowNewStacks = true, bool a_tryToFillEquippedFirst = false); + int AddItem(const cItem & a_ItemStack, bool a_AllowNewStacks = true); /** Same as AddItem, but works on an entire list of item stacks. The a_ItemStackList is modified to reflect the leftover items. If a_AllowNewStacks is set to false, only existing stacks can be topped up; if a_AllowNewStacks is set to true, empty slots can be used for the rest. - If a_tryToFillEquippedFirst is set to true, the currently equipped slot will be used first (if empty or - compatible with added items) - if a_tryToFillEquippedFirst is set to false, the regular order applies. Returns the total number of items that fit. */ - int AddItems(cItems & a_ItemStackList, bool a_AllowNewStacks, bool a_tryToFillEquippedFirst); + int AddItems(cItems & a_ItemStackList, bool a_AllowNewStacks); /** Removes the specified item from the inventory, as many as possible, up to a_ItemStack.m_ItemCount. Returns the number of items that were removed. */ |