diff options
Diffstat (limited to 'src/Blocks/BlockButton.h')
| -rw-r--r-- | src/Blocks/BlockButton.h | 83 |
1 files changed, 38 insertions, 45 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index aba20f8a1..1ce0e619a 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -16,14 +16,45 @@ class cBlockButtonHandler : public: - cBlockButtonHandler(BLOCKTYPE a_BlockType): - Super(a_BlockType) + using Super::Super; + + /** Extracts the ON bit from metadata and returns if true if it is set */ + static bool IsButtonOn(NIBBLETYPE a_Meta) { + return (a_Meta & 0x08) == 0x08; } + /** Event handler for an arrow striking a block. + Performs appropriate handling if the arrow intersected a wooden button. */ + static void OnArrowHit(cWorld & a_World, const Vector3i a_Position, const eBlockFace a_HitFace) + { + BLOCKTYPE Type; + NIBBLETYPE Meta; + const auto Pos = AddFaceDirection(a_Position, a_HitFace); + if ( + !a_World.GetBlockTypeMeta(Pos, Type, Meta) || + IsButtonOn(Meta) || + !IsButtonPressedByArrow(a_World, Pos, Type, Meta) + ) + { + // Bail if we're not specifically a wooden button, or it's already on + // or if the arrow didn't intersect. It is very important that nothing is + // done if the button is depressed, since the release task will already be queued + return; + } + a_World.SetBlockMeta(Pos, Meta | 0x08); + a_World.WakeUpSimulators(Pos); + // sound name is ok to be wood, because only wood gets triggered by arrow + a_World.GetBroadcastManager().BroadcastSoundEffect("block.wood_button.click_on", Pos, 0.5f, 0.6f); + + // Queue a button reset + QueueButtonRelease(a_World, Pos, Type); + } + +private: virtual bool OnUse( cChunkInterface & a_ChunkInterface, @@ -32,7 +63,7 @@ public: const Vector3i a_BlockPos, eBlockFace a_BlockFace, const Vector3i a_CursorPos - ) override + ) const override { NIBBLETYPE Meta = a_ChunkInterface.GetBlockMeta(a_BlockPos); @@ -61,7 +92,7 @@ public: - virtual bool IsUseable(void) override + virtual bool IsUseable(void) const override { return true; } @@ -77,7 +108,7 @@ public: eBlockFace a_ClickedBlockFace, const Vector3i a_CursorPos, BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta - ) override + ) const override { a_BlockType = m_BlockType; a_BlockMeta = BlockFaceToMetaData(a_ClickedBlockFace); @@ -135,7 +166,7 @@ public: - virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, const Vector3i a_RelPos, const cChunk & a_Chunk) override + virtual bool CanBeAt(cChunkInterface & a_ChunkInterface, const Vector3i a_RelPos, const cChunk & a_Chunk) const override { auto Meta = a_Chunk.GetMeta(a_RelPos); auto SupportRelPos = AddFaceDirection(a_RelPos, BlockMetaDataToBlockFace(Meta), true); @@ -153,50 +184,12 @@ public: - virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override + virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) const override { UNUSED(a_Meta); return 0; } - /** Extracts the ON bit from metadata and returns if true if it is set */ - static bool IsButtonOn(NIBBLETYPE a_Meta) - { - return (a_Meta & 0x08) == 0x08; - } - - /** Event handler for an arrow striking a block. - Performs appropriate handling if the arrow intersected a wooden button. */ - static void OnArrowHit(cWorld & a_World, const Vector3i a_Position, const eBlockFace a_HitFace) - { - BLOCKTYPE Type; - NIBBLETYPE Meta; - const auto Pos = AddFaceDirection(a_Position, a_HitFace); - - if ( - !a_World.GetBlockTypeMeta(Pos, Type, Meta) || - IsButtonOn(Meta) || - !IsButtonPressedByArrow(a_World, Pos, Type, Meta) - ) - { - // Bail if we're not specifically a wooden button, or it's already on - // or if the arrow didn't intersect. It is very important that nothing is - // done if the button is depressed, since the release task will already be queued - return; - } - - a_World.SetBlockMeta(Pos, Meta | 0x08); - a_World.WakeUpSimulators(Pos); - - // sound name is ok to be wood, because only wood gets triggered by arrow - a_World.GetBroadcastManager().BroadcastSoundEffect("block.wood_button.click_on", Pos, 0.5f, 0.6f); - - // Queue a button reset - QueueButtonRelease(a_World, Pos, Type); - } - -private: - /** Schedules a recurring event at appropriate intervals to release a button at a given position. The given block type is checked when the task is executed to ensure the position still contains a button. */ static void QueueButtonRelease(cWorld & a_ButtonWorld, const Vector3i a_Position, const BLOCKTYPE a_BlockType) |