diff options
| author | Alexander Harkness <me@bearbin.net> | 2015-05-27 13:21:17 +0200 |
|---|---|---|
| committer | Alexander Harkness <me@bearbin.net> | 2015-05-27 13:21:17 +0200 |
| commit | da4a76bb5043d072513b74823dc79279c75dd70c (patch) | |
| tree | 5c46cca70beb5e0b0d0161b5ccb306425e6426dd /src/Inventory.h | |
| parent | Merge pull request #2143 from jammet/patch-6 (diff) | |
| parent | Fixes #2041 (diff) | |
| download | cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.tar cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.tar.gz cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.tar.bz2 cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.tar.lz cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.tar.xz cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.tar.zst cuberite-da4a76bb5043d072513b74823dc79279c75dd70c.zip | |
Diffstat (limited to '')
| -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. */ |