From 73edd2b96102bff9fbd74d34740fea3daa40b15f Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Fri, 25 Apr 2014 17:15:12 -0700
Subject: Fixed a couple more warnings.

---
 src/Entities/FallingBlock.cpp |  4 +++-
 src/Entities/Minecart.cpp     | 34 ++++++++++++++--------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/Entities/FallingBlock.cpp b/src/Entities/FallingBlock.cpp
index a66c7e4ae..f48fb156b 100644
--- a/src/Entities/FallingBlock.cpp
+++ b/src/Entities/FallingBlock.cpp
@@ -87,7 +87,9 @@ void cFallingBlock::Tick(float a_Dt, cChunk & a_Chunk)
 	AddSpeedY(MilliDt * -9.8f);
 	AddPosition(GetSpeed() * MilliDt);
 
-	if ((GetSpeedX() != 0) || (GetSpeedZ() != 0))
+	//If not static (One billionth precision) broadcast movement.
+	float epsilon = 0.000000001;
+	if ((fabs(GetSpeedX()) > epsilon) || (fabs(GetSpeedZ()) > epsilon))
 	{
 		BroadcastMovementUpdate();
 	}
diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index db55eb058..ceaa713bb 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -234,18 +234,15 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
 			bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta);
 			if (EntCol || BlckCol) return;
 			
-			if (GetSpeedZ() != 0) // Don't do anything if cart is stationary
+			if (GetSpeedZ() > 0)
 			{
-				if (GetSpeedZ() > 0)
-				{
-					// Going SOUTH, slow down
-					AddSpeedZ(-0.1);
-				}
-				else
-				{
-					// Going NORTH, slow down
-					AddSpeedZ(0.1);
-				}
+				// Going SOUTH, slow down
+				AddSpeedZ(-0.1);
+			}
+			else if (GetSpeedZ() < 0)
+			{
+				// Going NORTH, slow down
+				AddSpeedZ(0.1);
 			}
 			break;
 		}
@@ -259,16 +256,13 @@ void cMinecart::HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt)
 			bool BlckCol = TestBlockCollision(a_RailMeta), EntCol = TestEntityCollision(a_RailMeta);
 			if (EntCol || BlckCol) return;
 
-			if (GetSpeedX() != 0)
+			if (GetSpeedX() > 0)
 			{
-				if (GetSpeedX() > 0)
-				{
-					AddSpeedX(-0.1);
-				}
-				else
-				{
-					AddSpeedX(0.1);
-				}
+				AddSpeedX(-0.1);
+			}
+			else if (GetSpeedX() < 0)
+			{
+				AddSpeedX(0.1);
 			}
 			break;
 		}
-- 
cgit v1.2.3