diff options
Diffstat (limited to '')
-rw-r--r-- | src/Items/ItemBed.h | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/src/Items/ItemBed.h b/src/Items/ItemBed.h index 0f085d489..9c79a134a 100644 --- a/src/Items/ItemBed.h +++ b/src/Items/ItemBed.h @@ -9,51 +9,60 @@ -class cItemBedHandler : +class cItemBedHandler: public cItemHandler { + using Super = cItemHandler; + public: - cItemBedHandler(int a_ItemType) : - cItemHandler(a_ItemType) + + cItemBedHandler(int a_ItemType): + Super(a_ItemType) { } + + + virtual bool IsPlaceable(void) override { return true; } + + + virtual bool GetBlocksToPlace( - cWorld & a_World, cPlayer & a_Player, const cItem & a_EquippedItem, - int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, - int a_CursorX, int a_CursorY, int a_CursorZ, + cWorld & a_World, + cPlayer & a_Player, + const cItem & a_EquippedItem, + const Vector3i a_PlacedBlockPos, + eBlockFace a_ClickedBlockFace, + const Vector3i a_CursorPos, sSetBlockVector & a_BlocksToPlace ) override { // Can only be placed on the floor: - if (a_BlockFace != BLOCK_FACE_TOP) + if (a_ClickedBlockFace != BLOCK_FACE_TOP) { return false; } // The "foot" block: NIBBLETYPE BlockMeta = cBlockBedHandler::YawToMetaData(a_Player.GetYaw()); - a_BlocksToPlace.emplace_back(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_BED, BlockMeta); + a_BlocksToPlace.emplace_back(a_PlacedBlockPos, E_BLOCK_BED, BlockMeta); // Check if there is empty space for the "head" block: // (Vanilla only allows beds to be placed into air) - Vector3i Direction = cBlockBedHandler::MetaDataToDirection(BlockMeta); - if (a_World.GetBlock(a_BlockX + Direction.x, a_BlockY, a_BlockZ + Direction.z) != E_BLOCK_AIR) + auto Direction = cBlockBedHandler::MetaDataToDirection(BlockMeta); + auto HeadPos = a_PlacedBlockPos + Direction; + if (a_World.GetBlock(HeadPos) != E_BLOCK_AIR) { return false; } - a_BlocksToPlace.emplace_back(a_BlockX + Direction.x, a_BlockY, a_BlockZ + Direction.z, E_BLOCK_BED, BlockMeta | 0x08); + a_BlocksToPlace.emplace_back(HeadPos, E_BLOCK_BED, BlockMeta | 0x08); return true; } -} ; - - - - +}; |