diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Items/ItemTorch.h | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/src/Items/ItemTorch.h b/src/Items/ItemTorch.h index 753ac09a9..ccba2a179 100644 --- a/src/Items/ItemTorch.h +++ b/src/Items/ItemTorch.h @@ -8,38 +8,45 @@ -class cItemTorchHandler final : - public cItemHandler +class cItemTorchHandler final : public cItemHandler { using Super = cItemHandler; -public: - + public: using Super::Super; -private: - + private: /** Converts the block face of the neighbor to which the torch is attached, to the torch block's meta. */ static NIBBLETYPE BlockFaceToMetaData(eBlockFace a_BlockFace) { switch (a_BlockFace) { - case BLOCK_FACE_TOP: return E_META_TORCH_FLOOR; - case BLOCK_FACE_EAST: return E_META_TORCH_EAST; - case BLOCK_FACE_WEST: return E_META_TORCH_WEST; - case BLOCK_FACE_NORTH: return E_META_TORCH_NORTH; - case BLOCK_FACE_SOUTH: return E_META_TORCH_SOUTH; - default: UNREACHABLE("Unsupported block face"); + case BLOCK_FACE_TOP: return E_META_TORCH_FLOOR; + case BLOCK_FACE_EAST: return E_META_TORCH_EAST; + case BLOCK_FACE_WEST: return E_META_TORCH_WEST; + case BLOCK_FACE_NORTH: return E_META_TORCH_NORTH; + case BLOCK_FACE_SOUTH: return E_META_TORCH_SOUTH; + default: UNREACHABLE("Unsupported block face"); } } - virtual bool CommitPlacement(cPlayer & a_Player, const cItem & a_HeldItem, const Vector3i a_PlacePosition, eBlockFace a_ClickedBlockFace, const Vector3i a_CursorPosition) const override + virtual bool CommitPlacement( + cPlayer & a_Player, + const cItem & a_HeldItem, + const Vector3i a_PlacePosition, + eBlockFace a_ClickedBlockFace, + const Vector3i a_CursorPosition + ) const override { const auto & World = *a_Player.GetWorld(); BLOCKTYPE ClickedBlockType; NIBBLETYPE ClickedBlockMeta; - World.GetBlockTypeMeta(AddFaceDirection(a_PlacePosition, a_ClickedBlockFace, true), ClickedBlockType, ClickedBlockMeta); + World.GetBlockTypeMeta( + AddFaceDirection(a_PlacePosition, a_ClickedBlockFace, true), + ClickedBlockType, + ClickedBlockMeta + ); // Try finding a suitable neighbor block face for the torch; start with the given one: if (!cBlockTorchHandler::CanBePlacedOn(ClickedBlockType, ClickedBlockMeta, a_ClickedBlockFace)) @@ -53,7 +60,11 @@ private: } } - return a_Player.PlaceBlock(a_PlacePosition, static_cast<BLOCKTYPE>(a_HeldItem.m_ItemType), BlockFaceToMetaData(a_ClickedBlockFace)); + return a_Player.PlaceBlock( + a_PlacePosition, + static_cast<BLOCKTYPE>(a_HeldItem.m_ItemType), + BlockFaceToMetaData(a_ClickedBlockFace) + ); } @@ -61,7 +72,9 @@ private: Returns BLOCK_FACE_NONE on failure. */ static eBlockFace FindSuitableFace(const cWorld & a_World, const Vector3i a_Position) { - for (const auto Face : { BLOCK_FACE_ZM, BLOCK_FACE_XP, BLOCK_FACE_ZP, BLOCK_FACE_XM, BLOCK_FACE_YP }) // Loop through all faces in specific order. + for (const auto Face : + {BLOCK_FACE_ZM, BLOCK_FACE_XP, BLOCK_FACE_ZP, BLOCK_FACE_XM, BLOCK_FACE_YP + }) // Loop through all faces in specific order. { // The direction of Face is relative to the direction the torch faces. // This is the position, computed inverted, that such a torch would attach to. |