summaryrefslogtreecommitdiffstats
path: root/src/Inventory.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-05 12:56:53 +0100
committerMattes D <github@xoft.cz>2014-12-05 12:58:47 +0100
commit44644ae0254bf3659c0995575041e2f656f20398 (patch)
tree571528b0f4864c0dab826a4366b9ad40049960be /src/Inventory.cpp
parentMerge pull request #1649 from jonfabe/InfoDumpFix (diff)
downloadcuberite-44644ae0254bf3659c0995575041e2f656f20398.tar
cuberite-44644ae0254bf3659c0995575041e2f656f20398.tar.gz
cuberite-44644ae0254bf3659c0995575041e2f656f20398.tar.bz2
cuberite-44644ae0254bf3659c0995575041e2f656f20398.tar.lz
cuberite-44644ae0254bf3659c0995575041e2f656f20398.tar.xz
cuberite-44644ae0254bf3659c0995575041e2f656f20398.tar.zst
cuberite-44644ae0254bf3659c0995575041e2f656f20398.zip
Diffstat (limited to '')
-rw-r--r--src/Inventory.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index 51ac32da9..fba6f4aea 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -507,7 +507,11 @@ bool cInventory::AddToBar( cItem & a_Item, const int a_Offset, const int a_Size,
int MaxStackSize = cItemHandler::GetItemHandler(a_Item.m_ItemType)->GetMaxStackSize();
for (int i = 0; i < a_Size; i++)
{
- if (m_Slots[i + a_Offset].m_ItemType == a_Item.m_ItemType && m_Slots[i + a_Offset].m_ItemCount < MaxStackSize && m_Slots[i + a_Offset].m_ItemDamage == a_Item.m_ItemDamage)
+ if (
+ (m_Slots[i + a_Offset].m_ItemType == a_Item.m_ItemType) &&
+ (m_Slots[i + a_Offset].m_ItemCount < MaxStackSize) &&
+ (m_Slots[i + a_Offset].m_ItemDamage == a_Item.m_ItemDamage)
+ )
{
int NumFree = MaxStackSize - m_Slots[i + a_Offset].m_ItemCount;
if (NumFree >= a_Item.m_ItemCount)
@@ -533,7 +537,7 @@ bool cInventory::AddToBar( cItem & a_Item, const int a_Offset, const int a_Size,
if (a_Mode > 0)
{
// If we got more left, find first empty slot
- for (int i = 0; i < a_Size && a_Item.m_ItemCount > 0; i++)
+ for (int i = 0; (i < a_Size) && (a_Item.m_ItemCount > 0); i++)
{
if (m_Slots[i + a_Offset].m_ItemType == -1)
{