diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-02-19 14:45:09 +0100 |
|---|---|---|
| committer | TheJumper <maximilian.springer@web.de> | 2014-02-23 19:50:50 +0100 |
| commit | 1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b (patch) | |
| tree | 617bf18a768a493c2cd428297168f57df0901c26 /src/Items | |
| parent | Add break to Protocol17x.cpp and use new comment delimiter (diff) | |
| download | cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.gz cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.bz2 cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.lz cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.xz cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.tar.zst cuberite-1f726b7d9dade75d8f7a3e105f3c9689a1ef0e0b.zip | |
Diffstat (limited to 'src/Items')
| -rw-r--r-- | src/Items/ItemHandler.cpp | 4 | ||||
| -rw-r--r-- | src/Items/ItemMobHead.h (renamed from src/Items/ItemSkull.h) | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp index 7a92ad64c..e9bb616a6 100644 --- a/src/Items/ItemHandler.cpp +++ b/src/Items/ItemHandler.cpp @@ -37,7 +37,7 @@ #include "ItemShears.h" #include "ItemShovel.h" #include "ItemSign.h" -#include "ItemSkull.h" +#include "ItemMobHead.h" #include "ItemSpawnEgg.h" #include "ItemSugarcane.h" #include "ItemSword.h" @@ -115,7 +115,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType) case E_ITEM_REDSTONE_REPEATER: return new cItemRedstoneRepeaterHandler(a_ItemType); case E_ITEM_SHEARS: return new cItemShearsHandler(a_ItemType); case E_ITEM_SIGN: return new cItemSignHandler(a_ItemType); - case E_ITEM_HEAD: return new cItemSkullHandler(a_ItemType); + case E_ITEM_HEAD: return new cItemMobHeadHandler(a_ItemType); case E_ITEM_SNOWBALL: return new cItemSnowballHandler(); case E_ITEM_SPAWN_EGG: return new cItemSpawnEggHandler(a_ItemType); case E_ITEM_SUGARCANE: return new cItemSugarcaneHandler(a_ItemType); diff --git a/src/Items/ItemSkull.h b/src/Items/ItemMobHead.h index 3648f1436..5ae040282 100644 --- a/src/Items/ItemSkull.h +++ b/src/Items/ItemMobHead.h @@ -8,11 +8,11 @@ -class cItemSkullHandler : +class cItemMobHeadHandler : public cItemHandler { public: - cItemSkullHandler(int a_ItemType) : + cItemMobHeadHandler(int a_ItemType) : cItemHandler(a_ItemType) { } @@ -31,10 +31,8 @@ public: BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta ) override { - a_BlockType = E_BLOCK_HEAD; a_BlockMeta = (NIBBLETYPE)(a_Player->GetEquippedItem().m_ItemDamage & 0x0f); - return true; } } ; |