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/Items | |
| 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 'src/Items')
| -rw-r--r-- | src/Items/ItemBucket.h | 4 | ||||
| -rw-r--r-- | src/Items/ItemEmptyMap.h | 2 | ||||
| -rw-r--r-- | src/Items/ItemMushroomSoup.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Items/ItemBucket.h b/src/Items/ItemBucket.h index 45b4030a3..0689670f9 100644 --- a/src/Items/ItemBucket.h +++ b/src/Items/ItemBucket.h @@ -103,7 +103,7 @@ public: ASSERT(!"Inventory bucket mismatch"); return true; } - if (a_Player->GetInventory().AddItem(cItem(NewItem), true, true) != 1) + if (a_Player->GetInventory().AddItem(cItem(NewItem)) != 1) { // The bucket didn't fit, toss it as a pickup: a_Player->TossPickup(cItem(NewItem)); @@ -151,7 +151,7 @@ public: return false; } cItem Item(E_ITEM_BUCKET, 1); - if (!a_Player->GetInventory().AddItem(Item, true, true)) + if (!a_Player->GetInventory().AddItem(Item)) { return false; } diff --git a/src/Items/ItemEmptyMap.h b/src/Items/ItemEmptyMap.h index 6e944b4da..fba8c0a2c 100644 --- a/src/Items/ItemEmptyMap.h +++ b/src/Items/ItemEmptyMap.h @@ -60,7 +60,7 @@ public: return true; } - a_Player->GetInventory().AddItem(cItem(E_ITEM_MAP, 1, (short)(NewMap->GetID() & 0x7fff)), true, true); + a_Player->GetInventory().AddItem(cItem(E_ITEM_MAP, 1, (short)(NewMap->GetID() & 0x7fff))); return true; } diff --git a/src/Items/ItemMushroomSoup.h b/src/Items/ItemMushroomSoup.h index dba313ec5..1a761cbf1 100644 --- a/src/Items/ItemMushroomSoup.h +++ b/src/Items/ItemMushroomSoup.h @@ -41,7 +41,7 @@ public: // Return a bowl to the inventory if (!a_Player->IsGameModeCreative()) { - a_Player->GetInventory().AddItem(cItem(E_ITEM_BOWL), true, true); + a_Player->GetInventory().AddItem(cItem(E_ITEM_BOWL)); } return true; } |