diff options
Diffstat (limited to 'src/Blocks/BlockSideways.h')
| -rw-r--r-- | src/Blocks/BlockSideways.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h index 5bc7874b4..017dc30e0 100644 --- a/src/Blocks/BlockSideways.h +++ b/src/Blocks/BlockSideways.h @@ -7,15 +7,25 @@ -class cBlockSidewaysHandler : public cBlockHandler +/** Handler for blocks that have 3 orientations (hay bale, log), specified by the upper 2 bits in meta. +Handles setting the correct orientation on placement. +Additionally supports the metadata specifying block sub-type in its lower 2 bits. */ +class cBlockSidewaysHandler: + public cBlockHandler { + using super = cBlockHandler; + public: - cBlockSidewaysHandler(BLOCKTYPE a_BlockType) - : cBlockHandler(a_BlockType) + + cBlockSidewaysHandler(BLOCKTYPE a_BlockType): + super(a_BlockType) { } + + + virtual bool GetPlacementBlockTypeMeta( cChunkInterface & a_ChunkInterface, cPlayer & a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, @@ -30,12 +40,19 @@ public: } - virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override + + + + virtual cItems ConvertToPickups(NIBBLETYPE a_BlockMeta, cBlockEntity * a_BlockEntity, const cEntity * a_Digger, const cItem * a_Tool) override { - a_Pickups.Add(m_BlockType, 1, a_BlockMeta & 0x3); // Reset meta + // Reset the orientation part of meta, keep the sub-type part of meta + return cItem(m_BlockType, 1, a_BlockMeta & 0x03); } + + + inline static NIBBLETYPE BlockFaceToMetaData(eBlockFace a_BlockFace, NIBBLETYPE a_Meta) { switch (a_BlockFace) |