diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-02-18 17:48:50 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-02-18 17:48:50 +0100 |
| commit | d47ff5520373acb359590fb036b6a761af58cf75 (patch) | |
| tree | 63f68f88d8bf8730da1dd32880ec526dc889bc6c /source/Items | |
| parent | Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols. (diff) | |
| download | cuberite-d47ff5520373acb359590fb036b6a761af58cf75.tar cuberite-d47ff5520373acb359590fb036b6a761af58cf75.tar.gz cuberite-d47ff5520373acb359590fb036b6a761af58cf75.tar.bz2 cuberite-d47ff5520373acb359590fb036b6a761af58cf75.tar.lz cuberite-d47ff5520373acb359590fb036b6a761af58cf75.tar.xz cuberite-d47ff5520373acb359590fb036b6a761af58cf75.tar.zst cuberite-d47ff5520373acb359590fb036b6a761af58cf75.zip | |
Diffstat (limited to 'source/Items')
| -rw-r--r-- | source/Items/ItemHandler.cpp | 40 | ||||
| -rw-r--r-- | source/Items/ItemMinecart.h | 79 |
2 files changed, 103 insertions, 16 deletions
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp index 6cb98706b..2b2d9268b 100644 --- a/source/Items/ItemHandler.cpp +++ b/source/Items/ItemHandler.cpp @@ -5,32 +5,33 @@ #include "../World.h"
#include "../Player.h"
-//Handler
+// Handlers:
+#include "ItemBed.h"
+#include "ItemBrewingStand.h"
+#include "ItemBucket.h"
+#include "ItemCauldron.h"
#include "ItemCloth.h"
+#include "ItemDoor.h"
+#include "ItemDye.h"
+#include "ItemFlowerPot.h"
+#include "ItemFood.h"
#include "ItemHoe.h"
-#include "ItemSlab.h"
-#include "ItemWood.h"
-#include "ItemShears.h"
#include "ItemLeaves.h"
-#include "ItemSapling.h"
-#include "ItemBucket.h"
#include "ItemLighter.h"
+#include "ItemMinecart.h"
+#include "ItemPickaxe.h"
#include "ItemRedstoneDust.h"
#include "ItemRedstoneRepeater.h"
+#include "ItemSapling.h"
#include "ItemSeeds.h"
-#include "ItemDye.h"
-#include "ItemSugarcane.h"
-#include "ItemPickaxe.h"
+#include "ItemShears.h"
#include "ItemShovel.h"
-#include "ItemSword.h"
-#include "ItemDoor.h"
-#include "ItemFood.h"
#include "ItemSign.h"
-#include "ItemBed.h"
+#include "ItemSlab.h"
#include "ItemSpawnEgg.h"
-#include "ItemFlowerPot.h"
-#include "ItemBrewingStand.h"
-#include "ItemCauldron.h"
+#include "ItemSugarcane.h"
+#include "ItemSword.h"
+#include "ItemWood.h"
#include "../Blocks/BlockHandler.h"
@@ -155,6 +156,13 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) return new cItemDoorHandler(a_ItemType);
}
+ case E_ITEM_MINECART:
+ case E_ITEM_CHEST_MINECART:
+ case E_ITEM_FURNACE_MINECART:
+ {
+ return new cItemMinecartHandler(a_ItemType);
+ }
+
// Food:
case E_ITEM_BREAD:
case E_ITEM_COOKIE:
diff --git a/source/Items/ItemMinecart.h b/source/Items/ItemMinecart.h new file mode 100644 index 000000000..5a2d78774 --- /dev/null +++ b/source/Items/ItemMinecart.h @@ -0,0 +1,79 @@ +
+// ItemMinecart.h
+
+// Declares the various minecart ItemHandlers
+
+
+
+
+
+#pragma once
+
+// Not needed, we're being included only from ItemHandler.cpp which already has this file: #include "ItemHandler.h"
+#include "../Minecart.h"
+
+
+
+
+
+class cItemMinecartHandler :
+ public cItemHandler
+{
+ typedef cItemHandler super;
+
+public:
+ cItemMinecartHandler(int a_ItemType) :
+ super(a_ItemType)
+ {
+ }
+
+
+
+ virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, cItem * a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override
+ {
+ if (a_Dir < 0)
+ {
+ return false;
+ }
+
+ // Check that there's rail in there:
+ BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
+ switch (Block)
+ {
+ case E_BLOCK_MINECART_TRACKS:
+ case E_BLOCK_POWERED_RAIL:
+ case E_BLOCK_DETECTOR_RAIL:
+ {
+ // These are allowed
+ break;
+ }
+ default:
+ {
+ LOGD("Used minecart on an unsuitable block %d (%s)", Block, ItemTypeToString(Block).c_str());
+ return false;
+ }
+ }
+
+ cMinecart::ePayload Payload = cMinecart::mpNone;
+ switch (m_ItemType)
+ {
+ case E_ITEM_MINECART: Payload = cMinecart::mpNone; break;
+ case E_ITEM_CHEST_MINECART: Payload = cMinecart::mpChest; break;
+ case E_ITEM_FURNACE_MINECART: Payload = cMinecart::mpFurnace; break;
+ default:
+ {
+ ASSERT(!"Unhandled minecart item");
+ return false;
+ }
+ } // switch (m_ItemType)
+ cMinecart * Minecart = new cMinecart(Payload, (double)a_BlockX + 0.5, a_BlockY, (double)a_BlockZ + 0.5);
+ a_World->AddEntity(Minecart);
+ Minecart->Initialize(a_World);
+ return true;
+ }
+
+} ;
+
+
+
+
|