From aef2c8ec628aa2522364da1333bc5158e55ac6a2 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sat, 26 Apr 2014 09:21:49 -0700
Subject: Further refactored, Reverted Minecart change

Other small changes.
---
 src/Entities/Minecart.cpp | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to 'src/Entities/Minecart.cpp')

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index ceaa713bb..db55eb058 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -234,15 +234,18 @@ 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)
-			{
-				// Going SOUTH, slow down
-				AddSpeedZ(-0.1);
-			}
-			else if (GetSpeedZ() < 0)
+			if (GetSpeedZ() != 0) // Don't do anything if cart is stationary
 			{
-				// Going NORTH, slow down
-				AddSpeedZ(0.1);
+				if (GetSpeedZ() > 0)
+				{
+					// Going SOUTH, slow down
+					AddSpeedZ(-0.1);
+				}
+				else
+				{
+					// Going NORTH, slow down
+					AddSpeedZ(0.1);
+				}
 			}
 			break;
 		}
@@ -256,13 +259,16 @@ 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)
-			{
-				AddSpeedX(-0.1);
-			}
-			else if (GetSpeedX() < 0)
+			if (GetSpeedX() != 0)
 			{
-				AddSpeedX(0.1);
+				if (GetSpeedX() > 0)
+				{
+					AddSpeedX(-0.1);
+				}
+				else
+				{
+					AddSpeedX(0.1);
+				}
 			}
 			break;
 		}
-- 
cgit v1.2.3