diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-16 08:07:30 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-16 08:07:30 +0100 |
| commit | 7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb (patch) | |
| tree | 637f4b6bc983705fa425990413c505b7beabba2f /source/Simulator/RedstoneSimulator.h | |
| parent | Levers (patch contributed by Keyboard) (diff) | |
| download | cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.tar cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.tar.gz cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.tar.bz2 cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.tar.lz cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.tar.xz cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.tar.zst cuberite-7f5bb5c3e30e1d644e8fd667e09155da3bb40fdb.zip | |
Diffstat (limited to 'source/Simulator/RedstoneSimulator.h')
| -rw-r--r-- | source/Simulator/RedstoneSimulator.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/Simulator/RedstoneSimulator.h b/source/Simulator/RedstoneSimulator.h index 14aceed56..089b84aeb 100644 --- a/source/Simulator/RedstoneSimulator.h +++ b/source/Simulator/RedstoneSimulator.h @@ -18,7 +18,7 @@ public: virtual void Simulate( float a_Dt ) override; virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return true; } - virtual void WakeUp( int a_X, int a_Y, int a_Z ) override; + virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ) override; enum eRedstoneDirection { @@ -28,15 +28,16 @@ public: REDSTONE_Z_POS = 0x4, REDSTONE_Z_NEG = 0x8, }; - eRedstoneDirection GetDirection( int a_X, int a_Y, int a_Z ); - eRedstoneDirection GetDirection( const Vector3i & a_Pos ) { return GetDirection( a_Pos.x, a_Pos.y, a_Pos.z ); } + eRedstoneDirection GetWireDirection(int a_BlockX, int a_BlockY, int a_BlockZ); + eRedstoneDirection GetWireDirection(const Vector3i & a_Pos) { return GetWireDirection(a_Pos.x, a_Pos.y, a_Pos.z); } static bool IsRepeaterPointingTo (const Vector3i & a_RepeaterPos, char a_MetaData, const Vector3i & a_BlockPos); static bool IsRepeaterPointingAway(const Vector3i & a_RepeaterPos, char a_MetaData, const Vector3i & a_BlockPos); static NIBBLETYPE RepeaterRotationToMetaData(float a_Rotation); static Vector3i GetRepeaterDirection(NIBBLETYPE a_MetaData); - static NIBBLETYPE LeverDirectionToMetaData(NIBBLETYPE a_dir); - static bool cRedstoneSimulator::IsLeverOn(cWorld *a_World, const Vector3i & a_BlockPos); + static NIBBLETYPE LeverDirectionToMetaData(char a_Dir); + static bool IsLeverOn(cWorld * a_World, const Vector3i & a_BlockPos); + static bool IsLeverOn(NIBBLETYPE a_BlockMeta); private: |