From 75937077136b9ec2eaba49c74543bdee323f68ff Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 9 Mar 2013 14:35:43 +0000 Subject: Pickups are now being saved into Anvil. Also changed cEntity rotation datatype to double git-svn-id: http://mc-server.googlecode.com/svn/trunk@1262 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Simulator/RedstoneSimulator.cpp | 8 ++++---- source/Simulator/RedstoneSimulator.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/Simulator') diff --git a/source/Simulator/RedstoneSimulator.cpp b/source/Simulator/RedstoneSimulator.cpp index cfbc3fb1f..0b947b71b 100644 --- a/source/Simulator/RedstoneSimulator.cpp +++ b/source/Simulator/RedstoneSimulator.cpp @@ -1015,15 +1015,15 @@ bool cRedstoneSimulator::IsRepeaterPointingAway(const Vector3i & a_RepeaterPos, -NIBBLETYPE cRedstoneSimulator::RepeaterRotationToMetaData(float a_Rotation) +NIBBLETYPE cRedstoneSimulator::RepeaterRotationToMetaData(double a_Rotation) { a_Rotation += 90 + 45; // So its not aligned with axis - if (a_Rotation > 360.f) + if (a_Rotation > 360) { - a_Rotation -= 360.f; + a_Rotation -= 360; } - if ((a_Rotation >= 0.f) && (a_Rotation < 90.f)) + if ((a_Rotation >= 0) && (a_Rotation < 90)) { return 0x1; } diff --git a/source/Simulator/RedstoneSimulator.h b/source/Simulator/RedstoneSimulator.h index 7d869fae1..37c9aa92e 100644 --- a/source/Simulator/RedstoneSimulator.h +++ b/source/Simulator/RedstoneSimulator.h @@ -33,7 +33,7 @@ public: 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 NIBBLETYPE RepeaterRotationToMetaData(double a_Rotation); static Vector3i GetRepeaterDirection(NIBBLETYPE a_MetaData); static NIBBLETYPE LeverDirectionToMetaData(char a_Dir); static bool IsLeverOn(cWorld * a_World, const Vector3i & a_BlockPos); -- cgit v1.2.3