diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-13 16:44:29 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-13 16:44:29 +0200 |
| commit | 0ac24a98e4055f791f7dccee89997a7852c865b7 (patch) | |
| tree | f1c361afa8142dcc1a169404b4f8deccb7dcf6b9 /source/ItemGrid.cpp | |
| parent | Removed comments (diff) | |
| parent | Merge pull request #84 from tonibm19/patch-2 (diff) | |
| download | cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.tar cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.tar.gz cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.tar.bz2 cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.tar.lz cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.tar.xz cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.tar.zst cuberite-0ac24a98e4055f791f7dccee89997a7852c865b7.zip | |
Diffstat (limited to 'source/ItemGrid.cpp')
| -rw-r--r-- | source/ItemGrid.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/ItemGrid.cpp b/source/ItemGrid.cpp index a977a9b6d..e9b86173e 100644 --- a/source/ItemGrid.cpp +++ b/source/ItemGrid.cpp @@ -213,7 +213,7 @@ void cItemGrid::Clear(void) -int cItemGrid::HowManyCanFit(const cItem & a_ItemStack) +int cItemGrid::HowManyCanFit(const cItem & a_ItemStack, bool a_AllowNewStacks) { char NumLeft = a_ItemStack.m_ItemCount; int MaxStack = ItemHandler(a_ItemStack.m_ItemType)->GetMaxStackSize(); @@ -221,7 +221,10 @@ int cItemGrid::HowManyCanFit(const cItem & a_ItemStack) { if (m_Slots[i].IsEmpty()) { - NumLeft -= MaxStack; + if (a_AllowNewStacks) + { + NumLeft -= MaxStack; + } } else if (m_Slots[i].IsStackableWith(a_ItemStack)) { |