diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-14 11:28:17 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-08-14 11:28:17 +0200 |
| commit | dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82 (patch) | |
| tree | d9c3b729b981c702ed623ee41ecf13c94aeae03b /source | |
| parent | Shift-click completed in survival inventory window (diff) | |
| download | cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.tar cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.tar.gz cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.tar.bz2 cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.tar.lz cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.tar.xz cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.tar.zst cuberite-dfa9a1e7c4a19d8f725f1a70c88e642aaa3a2c82.zip | |
Diffstat (limited to 'source')
| -rw-r--r-- | source/BlockID.h | 6 | ||||
| -rw-r--r-- | source/items/Item.cpp | 37 |
2 files changed, 29 insertions, 14 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index 139e08eb7..a66e7f026 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -356,8 +356,10 @@ enum ENUM_ITEM_ID E_ITEM_GOLD_LEGGINGS = 316, E_ITEM_GOLD_BOOTS = 317, E_ITEM_FLINT = 318, - E_ITEM_RAW_MEAT = 319, - E_ITEM_COOKED_MEAT = 320, + E_ITEM_RAW_PORKCHOP = 319, + E_ITEM_RAW_MEAT = 319, // OBSOLETE, use E_ITEM_RAW_PORKCHOP instead + E_ITEM_COOKED_PORKCHOP = 320, + E_ITEM_COOKED_MEAT = 320, // OBSOLETE, use E_ITEM_COOKED_PORKCHOP instead E_ITEM_PAINTINGS = 321, E_ITEM_GOLDEN_APPLE = 322, E_ITEM_SIGN = 323, diff --git a/source/items/Item.cpp b/source/items/Item.cpp index fbc862d7d..b645a8a93 100644 --- a/source/items/Item.cpp +++ b/source/items/Item.cpp @@ -247,18 +247,31 @@ char cItemHandler::GetMaxStackSize(void) switch (m_ItemID)
{
- 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;
- case E_ITEM_BONE: return 64;
- case E_ITEM_BOOK: return 64;
- case E_ITEM_BOWL: return 64;
- case E_ITEM_BREAD: return 64;
- case E_ITEM_BROWN_MUSHROOM: return 64;
- case E_ITEM_BUCKET: return 1; // TODO: change this to 16 when turning compatibility to 1.3
- case E_ITEM_COAL: return 64;
- case E_ITEM_DIAMOND: return 64;
+ 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;
+ case E_ITEM_BONE: return 64;
+ case E_ITEM_BOOK: return 64;
+ case E_ITEM_BOWL: return 64;
+ case E_ITEM_BREAD: return 64;
+ case E_ITEM_BROWN_MUSHROOM: return 64;
+ case E_ITEM_BUCKET: return 1; // TODO: change this to 16 when turning compatibility to 1.3
+ case E_ITEM_COAL: return 64;
+ case E_ITEM_COOKED_CHICKEN: return 64;
+ case E_ITEM_COOKED_FISH: return 64;
+ case E_ITEM_COOKED_PORKCHOP: return 64;
+ case E_ITEM_DIAMOND: return 64;
+ case E_ITEM_FEATHER: return 64;
+ case E_ITEM_FLINT: return 64;
+ case E_ITEM_GOLD: return 64;
+ case E_ITEM_GUNPOWDER: return 64;
+ case E_ITEM_IRON: return 64;
+ case E_ITEM_RAW_PORKCHOP: return 64;
+ case E_ITEM_SEEDS: return 64;
+ case E_ITEM_STICK: return 64;
+ case E_ITEM_STRING: return 64;
+ case E_ITEM_WHEAT: return 64;
}
// By default items don't stack:
return 1;
|