summaryrefslogtreecommitdiffstats
path: root/source/Items
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-18 01:01:20 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-09-18 01:01:20 +0200
commit480991d1ac07c1715bf090a4d81e988a00803cf3 (patch)
tree2349c93e693142ad212ead0fed6033c00819b455 /source/Items
parentSnow now supports meta values (diff)
downloadcuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.tar
cuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.tar.gz
cuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.tar.bz2
cuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.tar.lz
cuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.tar.xz
cuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.tar.zst
cuberite-480991d1ac07c1715bf090a4d81e988a00803cf3.zip
Diffstat (limited to 'source/Items')
-rw-r--r--source/Items/ItemHandler.cpp14
-rw-r--r--source/Items/ItemSlab.h52
-rw-r--r--source/Items/ItemWood.h22
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)
- {
- }
-} ;
-
-
-
-