diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-16 21:19:46 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-08-16 21:19:46 +0200 |
| commit | 4face38fdc6872f7e1ad26c28baa52836a2e709f (patch) | |
| tree | 9ee407dd1d3ab05c100888d91318950e8c5e968b /source/Items | |
| parent | Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX. (diff) | |
| parent | Another compile fix (diff) | |
| download | cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.tar cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.tar.gz cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.tar.bz2 cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.tar.lz cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.tar.xz cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.tar.zst cuberite-4face38fdc6872f7e1ad26c28baa52836a2e709f.zip | |
Diffstat (limited to 'source/Items')
| -rw-r--r-- | source/Items/ItemHandler.cpp | 2 | ||||
| -rw-r--r-- | source/Items/ItemMinecart.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp index f3f4ac6e7..a831bb713 100644 --- a/source/Items/ItemHandler.cpp +++ b/source/Items/ItemHandler.cpp @@ -162,6 +162,8 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) case E_ITEM_MINECART: case E_ITEM_CHEST_MINECART: case E_ITEM_FURNACE_MINECART: + case E_ITEM_MINECART_WITH_TNT: + case E_ITEM_MINECART_WITH_HOPPER: { return new cItemMinecartHandler(a_ItemType); } diff --git a/source/Items/ItemMinecart.h b/source/Items/ItemMinecart.h index 1470104a3..df970638e 100644 --- a/source/Items/ItemMinecart.h +++ b/source/Items/ItemMinecart.h @@ -43,6 +43,7 @@ public: case E_BLOCK_MINECART_TRACKS: case E_BLOCK_POWERED_RAIL: case E_BLOCK_DETECTOR_RAIL: + case E_BLOCK_ACTIVATOR_RAIL: { // These are allowed break; @@ -60,9 +61,11 @@ public: cMinecart * Minecart = NULL; switch (m_ItemType) { - case E_ITEM_MINECART: Minecart = new cEmptyMinecart (x, y, z); break; - case E_ITEM_CHEST_MINECART: Minecart = new cMinecartWithChest (x, y, z); break; - case E_ITEM_FURNACE_MINECART: Minecart = new cMinecartWithFurnace(x, y, z); break; + case E_ITEM_MINECART: Minecart = new cEmptyMinecart (x, y, z); break; + case E_ITEM_CHEST_MINECART: Minecart = new cMinecartWithChest (x, y, z); break; + case E_ITEM_FURNACE_MINECART: Minecart = new cMinecartWithFurnace (x, y, z); break; + case E_ITEM_MINECART_WITH_TNT: Minecart = new cMinecartWithTNT (x, y, z); break; + case E_ITEM_MINECART_WITH_HOPPER: Minecart = new cMinecartWithHopper (x, y, z); break; default: { ASSERT(!"Unhandled minecart item"); |