diff options
author | Mattes D <github@xoft.cz> | 2013-09-18 08:09:35 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2013-09-18 08:09:35 +0200 |
commit | aa2edeae7754b6543cc0bd5a234f15d395da4c67 (patch) | |
tree | ef92d1a6f215c15deffc8f41139bdc8b3ccf26d5 /source/Items | |
parent | Merge pull request #175 from tigerw/bugfixes (diff) | |
parent | Multiple fixes [SEE DESC] (diff) | |
download | cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.tar cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.tar.gz cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.tar.bz2 cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.tar.lz cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.tar.xz cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.tar.zst cuberite-aa2edeae7754b6543cc0bd5a234f15d395da4c67.zip |
Diffstat (limited to 'source/Items')
-rw-r--r-- | source/Items/ItemHandler.cpp | 14 | ||||
-rw-r--r-- | source/Items/ItemSlab.h | 52 | ||||
-rw-r--r-- | source/Items/ItemWood.h | 22 |
3 files changed, 0 insertions, 88 deletions
diff --git a/source/Items/ItemHandler.cpp b/source/Items/ItemHandler.cpp index 08a7b661d..3c2fa1e79 100644 --- a/source/Items/ItemHandler.cpp +++ b/source/Items/ItemHandler.cpp @@ -31,11 +31,9 @@ #include "ItemShears.h" #include "ItemShovel.h" #include "ItemSign.h" -#include "ItemSlab.h" #include "ItemSpawnEgg.h" #include "ItemSugarcane.h" #include "ItemSword.h" -#include "ItemWood.h" #include "../Blocks/BlockHandler.h" @@ -143,18 +141,6 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) return new cItemSwordHandler(a_ItemType); } - case E_BLOCK_STONE_SLAB: - case E_BLOCK_WOODEN_SLAB: - { - return new cItemSlabHandler(a_ItemType); - } - - case E_BLOCK_LOG: - case E_BLOCK_PLANKS: - { - return new cItemWoodHandler(a_ItemType); - } - case E_ITEM_BUCKET: case E_ITEM_WATER_BUCKET: case E_ITEM_LAVA_BUCKET: diff --git a/source/Items/ItemSlab.h b/source/Items/ItemSlab.h deleted file mode 100644 index 80de05eb5..000000000 --- a/source/Items/ItemSlab.h +++ /dev/null @@ -1,52 +0,0 @@ - -#pragma once - -#include "ItemHandler.h" -#include "../World.h" - - - - - -class cItemSlabHandler : public cItemHandler -{ -public: - cItemSlabHandler(int a_ItemType) - : cItemHandler(a_ItemType) - { - - } - - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override - { - BLOCKTYPE Block; - NIBBLETYPE Meta; - a_World->GetBlockTypeMeta(a_BlockX, a_BlockY, a_BlockZ, Block, Meta); - - if ( - ((a_Dir == 0) || (a_Dir == 1)) // Only when clicking on top or on bottom of the block - && ((Block == E_BLOCK_WOODEN_SLAB) || (Block == E_BLOCK_STONE_SLAB)) // It is a slab - && (Block == a_Item.m_ItemType) // Same slab - && ((Meta & 0x7) == (a_Item.m_ItemDamage & 0x7))) // Same Texture - { - if (a_Player->GetGameMode() == eGameMode_Creative) - { - a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement - return true; - } - else - { - if (a_Player->GetInventory().RemoveOneEquippedItem()) - { - a_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, Block - 1, Meta); // Block - 1 simple hack to save one if statement - return true; - } - } - } - return false; - } -} ; - - - - diff --git a/source/Items/ItemWood.h b/source/Items/ItemWood.h deleted file mode 100644 index 476256c5d..000000000 --- a/source/Items/ItemWood.h +++ /dev/null @@ -1,22 +0,0 @@ - -#pragma once - -#include "ItemHandler.h" - - - - - -class cItemWoodHandler : - public cItemHandler -{ -public: - cItemWoodHandler(int a_ItemType) - : cItemHandler(a_ItemType) - { - } -} ; - - - - |