From 487f9a2aa9b5497495cef1ac3b9c7a603e69f862 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Tue, 21 Apr 2020 22:19:22 +0200 Subject: Vector3 in Handlers (#4680) Refactored all cBlockHandler and cItemHandler descendants to use Vector3. --- src/Items/ItemSapling.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'src/Items/ItemSapling.h') diff --git a/src/Items/ItemSapling.h b/src/Items/ItemSapling.h index e8deb37a9..513f542f6 100644 --- a/src/Items/ItemSapling.h +++ b/src/Items/ItemSapling.h @@ -17,24 +17,29 @@ public: cItemSaplingHandler(int a_ItemType): Super(a_ItemType) { - } + + + + virtual bool GetPlacementBlockTypeMeta( cWorld * a_World, cPlayer * a_Player, - int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, - int a_CursorX, int a_CursorY, int a_CursorZ, + const Vector3i a_PlacedBlockPos, + eBlockFace a_ClickedBlockFace, + const Vector3i a_CursorPos, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta ) override { bool res = Super::GetPlacementBlockTypeMeta( a_World, a_Player, - a_BlockX, a_BlockY, a_BlockZ, a_BlockFace, - a_CursorX, a_CursorY, a_CursorZ, + a_PlacedBlockPos, a_ClickedBlockFace, + a_CursorPos, a_BlockType, a_BlockMeta ); - // Only the lowest 3 bits are important - a_BlockMeta = a_BlockMeta & 0x7; + + // Allow only the lowest 3 bits (top bit is for growth): + a_BlockMeta = a_BlockMeta & 0x07; return res; } } ; -- cgit v1.2.3