summaryrefslogtreecommitdiffstats
path: root/src/Inventory.cpp
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-31 16:52:51 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-31 16:52:51 +0100
commit173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93 (patch)
treef22cc0530050584e430ede31481b34bff48b3e2f /src/Inventory.cpp
parentfixed bad merge (diff)
parentremoved unneccisary cast (diff)
downloadcuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.tar
cuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.tar.gz
cuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.tar.bz2
cuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.tar.lz
cuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.tar.xz
cuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.tar.zst
cuberite-173ed0e653d05dbcfac9cfeeb6b75b7ea61b0e93.zip
Diffstat (limited to 'src/Inventory.cpp')
-rw-r--r--src/Inventory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index a9b4ab9c5..a7f77cf6d 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -57,6 +57,8 @@ int cInventory::HowManyCanFit(const cItem & a_ItemStack, bool a_ConsiderEmptySlo
int cInventory::HowManyCanFit(const cItem & a_ItemStack, int a_BeginSlotNum, int a_EndSlotNum, bool a_ConsiderEmptySlots)
{
+
+ UNUSED(a_ConsiderEmptySlots);
if ((a_BeginSlotNum < 0) || (a_BeginSlotNum >= invNumSlots))
{
LOGWARNING("%s: Bad BeginSlotNum, got %d, there are %d slots; correcting to 0.", __FUNCTION__, a_BeginSlotNum, invNumSlots - 1);
@@ -96,8 +98,6 @@ int cInventory::HowManyCanFit(const cItem & a_ItemStack, int a_BeginSlotNum, int
-
-
int cInventory::AddItem(const cItem & a_Item, bool a_AllowNewStacks, bool a_tryToFillEquippedFirst)
{
cItem ToAdd(a_Item);