summaryrefslogtreecommitdiffstats
path: root/source/Items
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-16 12:12:56 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-02-16 12:12:56 +0100
commit32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6 (patch)
tree0d336dd2935b40610d884892e493f41d81f56573 /source/Items
parentAdded API.txt into project for reference (diff)
downloadcuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.tar
cuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.tar.gz
cuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.tar.bz2
cuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.tar.lz
cuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.tar.xz
cuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.tar.zst
cuberite-32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6.zip
Diffstat (limited to '')
-rw-r--r--source/Items/ItemFood.h4
-rw-r--r--source/Items/ItemHandler.cpp20
-rw-r--r--source/Items/ItemShears.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/source/Items/ItemFood.h b/source/Items/ItemFood.h
index 8faed1d05..d4c0a012a 100644
--- a/source/Items/ItemFood.h
+++ b/source/Items/ItemFood.h
@@ -32,10 +32,10 @@ public:
case E_ITEM_COOKED_CHICKEN:
return FoodInfo(6, 7.2f);
case E_ITEM_RAW_BEEF:
- case E_ITEM_RAW_MEAT:
+ case E_ITEM_RAW_PORKCHOP:
return FoodInfo(3, 1.8f);
case E_ITEM_STEAK:
- case E_ITEM_COOKED_MEAT:
+ case E_ITEM_COOKED_PORKCHOP:
return FoodInfo(8, 12.8f);
case E_ITEM_RAW_FISH:
return FoodInfo(2, 1.2f);
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
index 4a465c272..6cb98706b 100644
--- a/source/Items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -71,21 +71,21 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
default: return new cItemHandler(a_ItemType);
// Single item per handler, alphabetically sorted:
+ case E_BLOCK_LEAVES: return new cItemLeavesHandler(a_ItemType);
+ case E_BLOCK_SAPLING: return new cItemSaplingHandler(a_ItemType);
+ case E_BLOCK_WOOL: return new cItemClothHandler(a_ItemType);
case E_ITEM_BED: return new cItemBedHandler(a_ItemType);
case E_ITEM_BREWING_STAND: return new cItemBrewingStandHandler(a_ItemType);
case E_ITEM_CAULDRON: return new cItemCauldronHandler(a_ItemType);
case E_ITEM_DYE: return new cItemDyeHandler(a_ItemType);
case E_ITEM_FLINT_AND_STEEL: return new cItemLighterHandler(a_ItemType);
case E_ITEM_FLOWER_POT: return new cItemFlowerPotHandler(a_ItemType);
- case E_ITEM_LEAVES: return new cItemLeavesHandler(a_ItemType);
case E_ITEM_REDSTONE_DUST: return new cItemRedstoneDustHandler(a_ItemType);
case E_ITEM_REDSTONE_REPEATER: return new cItemRedstoneRepeaterHandler(a_ItemType);
- case E_ITEM_SAPLING: return new cItemSaplingHandler(a_ItemType);
case E_ITEM_SHEARS: return new cItemShearsHandler(a_ItemType);
case E_ITEM_SIGN: return new cItemSignHandler(a_ItemType);
case E_ITEM_SPAWN_EGG: return new cItemSpawnEggHandler(a_ItemType);
case E_ITEM_SUGARCANE: return new cItemSugarcaneHandler(a_ItemType);
- case E_ITEM_WOOL: return new cItemClothHandler(a_ItemType);
case E_ITEM_WOODEN_HOE:
case E_ITEM_STONE_HOE:
@@ -123,14 +123,14 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
return new cItemSwordHandler(a_ItemType);
}
- case E_ITEM_STONE_SLAB:
- case E_ITEM_WOODEN_SLAB:
+ case E_BLOCK_STONE_SLAB:
+ case E_BLOCK_WOODEN_SLAB:
{
return new cItemSlabHandler(a_ItemType);
}
- case E_ITEM_LOG:
- case E_ITEM_PLANKS:
+ case E_BLOCK_LOG:
+ case E_BLOCK_PLANKS:
{
return new cItemWoodHandler(a_ItemType);
}
@@ -162,9 +162,9 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
case E_ITEM_RAW_CHICKEN:
case E_ITEM_COOKED_CHICKEN:
case E_ITEM_RAW_BEEF:
- case E_ITEM_RAW_MEAT:
+ case E_ITEM_RAW_PORKCHOP:
case E_ITEM_STEAK:
- case E_ITEM_COOKED_MEAT:
+ case E_ITEM_COOKED_PORKCHOP:
case E_ITEM_RAW_FISH:
case E_ITEM_COOKED_FISH:
case E_ITEM_RED_APPLE:
@@ -261,7 +261,6 @@ char cItemHandler::GetMaxStackSize(void)
switch (m_ItemType) //sorted by id
{
- case E_ITEM_APPLE: return 64;
case E_ITEM_ARROW: return 64;
case E_ITEM_BLAZE_POWDER: return 64;
case E_ITEM_BLAZE_ROD: return 64;
@@ -311,6 +310,7 @@ char cItemHandler::GetMaxStackSize(void)
case E_ITEM_RAW_CHICKEN: return 64;
case E_ITEM_RAW_FISH: return 64;
case E_ITEM_RAW_PORKCHOP: return 64;
+ case E_ITEM_RED_APPLE: return 64;
case E_ITEM_REDSTONE_DUST: return 64;
case E_ITEM_REDSTONE_REPEATER: return 64;
case E_ITEM_ROTTEN_FLESH: return 64;
diff --git a/source/Items/ItemShears.h b/source/Items/ItemShears.h
index 743cbeaec..f1424ee2e 100644
--- a/source/Items/ItemShears.h
+++ b/source/Items/ItemShears.h
@@ -31,7 +31,7 @@ public:
if (Block == E_BLOCK_LEAVES)
{
cItems Drops;
- Drops.push_back(cItem(E_ITEM_LEAVES, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ)));
+ Drops.push_back(cItem(E_BLOCK_LEAVES, 1, a_World->GetBlockMeta(a_BlockX, a_BlockY, a_BlockZ)));
a_World->SpawnItemPickups(Drops, a_BlockX, a_BlockY, a_BlockZ);
a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_AIR, 0);