From 43e684071933adef93040e8d4b830d5c6b71cf9a Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 12 Jan 2013 04:46:01 +0000 Subject: Merged branch "branches/hooks" into "trunk". git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Items/ItemCauldron.h | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'source/Items/ItemCauldron.h') diff --git a/source/Items/ItemCauldron.h b/source/Items/ItemCauldron.h index 96ddf6c05..216766cf8 100644 --- a/source/Items/ItemCauldron.h +++ b/source/Items/ItemCauldron.h @@ -3,23 +3,39 @@ #include "ItemHandler.h" -class cItemCauldronHandler : public cItemHandler + + + + +class cItemCauldronHandler : + public cItemHandler { public: - cItemCauldronHandler(int a_ItemType) - : cItemHandler(a_ItemType) + cItemCauldronHandler(int a_ItemType) : + cItemHandler(a_ItemType) { - } - virtual bool IsPlaceable() override + + virtual bool IsPlaceable(void) override { return true; } - virtual BLOCKTYPE GetBlockType() override + + virtual bool GetPlacementBlockTypeMeta( + cWorld * a_World, cPlayer * a_Player, + int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, + int a_CursorX, int a_CursorY, int a_CursorZ, + BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta + ) override { - return E_BLOCK_CAULDRON; + a_BlockType = E_BLOCK_CAULDRON; + a_BlockMeta = 0; + return true; } +} ; + + + -}; \ No newline at end of file -- cgit v1.2.3