diff options
Diffstat (limited to 'source/Items/ItemBucket.h')
| -rw-r--r-- | source/Items/ItemBucket.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/Items/ItemBucket.h b/source/Items/ItemBucket.h index 098742724..4792fa62d 100644 --- a/source/Items/ItemBucket.h +++ b/source/Items/ItemBucket.h @@ -81,8 +81,7 @@ public: }
// Remove the bucket from the inventory
- cItem Item(a_Item.m_ItemType, 1);
- if (!a_Player->GetInventory().RemoveItem(Item))
+ if (!a_Player->GetInventory().RemoveOneEquippedItem())
{
LOG("Clicked with an empty bucket, but cannot remove one from the inventory? WTF?");
ASSERT(!"Inventory bucket mismatch");
@@ -90,8 +89,7 @@ public: }
// Give new bucket, filled with fluid:
- Item.m_ItemType = NewItem;
- Item.m_ItemCount = 1;
+ cItem Item(NewItem, 1);
a_Player->GetInventory().AddItem(Item);
// Remove water / lava block
@@ -131,15 +129,13 @@ public: if (a_Player->GetGameMode() != gmCreative)
{
// Remove fluid bucket, add empty bucket:
- cItem Item(a_Item.m_ItemType, 1);
- if (!a_Player->GetInventory().RemoveItem(Item))
+ if (!a_Player->GetInventory().RemoveOneEquippedItem())
{
LOG("Clicked with a full bucket, but cannot remove one from the inventory? WTF?");
ASSERT(!"Inventory bucket mismatch");
return false;
}
- Item.m_ItemType = E_ITEM_BUCKET;
- Item.m_ItemCount = 1;
+ cItem Item(E_ITEM_BUCKET, 1);
if (!a_Player->GetInventory().AddItem(Item))
{
return false;
|