summaryrefslogtreecommitdiffstats
path: root/source/Blocks/BlockLever.h
diff options
context:
space:
mode:
Diffstat (limited to 'source/Blocks/BlockLever.h')
-rw-r--r--source/Blocks/BlockLever.h26
1 files changed, 21 insertions, 5 deletions
diff --git a/source/Blocks/BlockLever.h b/source/Blocks/BlockLever.h
index 7e4d15dda..d03443abd 100644
--- a/source/Blocks/BlockLever.h
+++ b/source/Blocks/BlockLever.h
@@ -2,6 +2,9 @@
#include "BlockHandler.h"
#include "../World.h"
+#include "../Simulator/RedstoneSimulator.h"
+
+
@@ -10,11 +13,9 @@ class cBlockLeverHandler :
{
public:
cBlockLeverHandler(BLOCKTYPE a_BlockType);
- virtual void OnPlaced(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, int a_Dir) override;
- virtual void OnDestroyed(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ) override;
virtual void OnDigging(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override;
- virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) override;
+ virtual void OnUse(cWorld * a_World, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace, int a_CursorX, int a_CursorY, int a_CursorZ) override;
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
@@ -30,16 +31,31 @@ public:
}
- virtual void PlaceBlock(cWorld * a_World, cPlayer * a_Player, NIBBLETYPE a_BlockMeta, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir) override;
-
+ virtual bool GetPlacementBlockTypeMeta(
+ cWorld * a_World, cPlayer * a_Player,
+ int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace,
+ int a_CursorX, int a_CursorY, int a_CursorZ,
+ BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta
+ ) override
+ {
+ a_BlockType = m_BlockType;
+ a_BlockMeta = cRedstoneSimulator::LeverDirectionToMetaData(a_BlockFace);
+ return true;
+ }
+
virtual bool DoesAllowBlockOnTop(void) override
{
return false;
}
+
virtual const char * GetStepSound(void) override
{
return "step.wood";
}
} ;
+
+
+
+