From 8f7b9acb488a2dc4a9c34de499a3cd0e0829ef40 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 13 Aug 2014 12:10:21 +0100
Subject: [PATCH 01/21] Fixed forgotten error checking

---
 src/CraftingRecipes.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 1a31a6e90..085b6e0d5 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -324,7 +324,11 @@ void cCraftingRecipes::LoadRecipes(void)
 		return;
 	}
 	AString Everything;
-	f.ReadRestOfFile(Everything);
+	if (!f.ReadRestOfFile(Everything))
+	{
+		LOGWARNING("Cannot read file \"crafting.txt\", no crafting recipes will be available!");
+		return;
+	}
 	f.Close();
 	
 	// Split it into lines, then process each line as a single recipe:

From c3c3d3a72d7517863f015364e62ca0dff46a6807 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 13 Aug 2014 12:14:55 +0100
Subject: [PATCH 02/21] Fixed type issues in CraftingRecipe.cpp

---
 src/CraftingRecipes.cpp | 4 ++--
 src/CraftingRecipes.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 085b6e0d5..48178eecb 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -83,7 +83,7 @@ cItem & cCraftingGrid::GetItem(int x, int y) const
 
 
 
-void cCraftingGrid::SetItem(int x, int y, ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth)
+void cCraftingGrid::SetItem(int x, int y, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth)
 {
 	// Accessible through scripting, must verify parameters:
 	if ((x < 0) || (x >= m_Width) || (y < 0) || (y >= m_Height))
@@ -228,7 +228,7 @@ void cCraftingRecipe::Clear(void)
 
 
 
-void cCraftingRecipe::SetResult(ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth)
+void cCraftingRecipe::SetResult(ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth)
 {
 	m_Result = cItem(a_ItemType, a_ItemCount, a_ItemHealth);
 }
diff --git a/src/CraftingRecipes.h b/src/CraftingRecipes.h
index 0250d2f68..fe1e15817 100644
--- a/src/CraftingRecipes.h
+++ b/src/CraftingRecipes.h
@@ -33,7 +33,7 @@ public:
 	int     GetWidth (void) const {return m_Width; }
 	int     GetHeight(void) const {return m_Height; }
 	cItem & GetItem  (int x, int y) const;
-	void    SetItem  (int x, int y, ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth);
+	void    SetItem  (int x, int y, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth);
 	void    SetItem  (int x, int y, const cItem & a_Item);
 	void    Clear    (void);
 	
@@ -72,13 +72,13 @@ public:
 	int           GetIngredientsHeight(void) const {return m_Ingredients.GetHeight(); }
 	cItem &       GetIngredient       (int x, int y) const {return m_Ingredients.GetItem(x, y); }
 	const cItem & GetResult           (void) const {return m_Result; }
-	void          SetResult           (ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth);
+	void          SetResult           (ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth);
 	void          SetResult           (const cItem & a_Item)
 	{
 		m_Result = a_Item;
 	}
 	
-	void          SetIngredient       (int x, int y, ENUM_ITEM_ID a_ItemType, int a_ItemCount, short a_ItemHealth)
+	void          SetIngredient       (int x, int y, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemHealth)
 	{
 		m_Ingredients.SetItem(x, y, a_ItemType, a_ItemCount, a_ItemHealth);
 	}

From 781e1e6264794ec0fddccd37a76f7a78a3fa8b09 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 13 Aug 2014 13:03:56 +0100
Subject: [PATCH 03/21] Fixed Integer pasing warnings in CraftingRecipies.cpp

---
 src/CraftingRecipes.cpp |  6 ++--
 src/StringUtils.h       | 62 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/CraftingRecipes.cpp b/src/CraftingRecipes.cpp
index 48178eecb..2d80ecaf8 100644
--- a/src/CraftingRecipes.cpp
+++ b/src/CraftingRecipes.cpp
@@ -392,8 +392,7 @@ void cCraftingRecipes::AddRecipeLine(int a_LineNum, const AString & a_RecipeLine
 	}
 	if (ResultSplit.size() > 1)
 	{
-		Recipe->m_Result.m_ItemCount = atoi(ResultSplit[1].c_str());
-		if (Recipe->m_Result.m_ItemCount == 0)
+		if (!StringToInteger<char>(ResultSplit[1].c_str(), Recipe->m_Result.m_ItemCount))
 		{
 			LOGWARNING("crafting.txt: line %d: Cannot parse result count, ignoring the recipe.", a_LineNum);
 			LOGINFO("Offending line: \"%s\"", a_RecipeLine.c_str());
@@ -445,8 +444,7 @@ bool cCraftingRecipes::ParseItem(const AString & a_String, cItem & a_Item)
 	if (Split.size() > 1)
 	{
 		AString Damage = TrimString(Split[1]);
-		a_Item.m_ItemDamage = atoi(Damage.c_str());
-		if ((a_Item.m_ItemDamage == 0) && (Damage.compare("0") != 0))
+		if (!StringToInteger<short>(Damage.c_str(), a_Item.m_ItemDamage))
 		{
 			// Parsing the number failed
 			return false;
diff --git a/src/StringUtils.h b/src/StringUtils.h
index 142aaf59b..56ac83942 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -99,6 +99,68 @@ extern int GetBEInt(const char * a_Mem);
 /// Writes four bytes to the specified memory location so that they interpret as BigEndian int
 extern void SetBEInt(char * a_Mem, Int32 a_Value);
 
+/// Parses any integer type. Checks bounds and 
+template<class T>
+bool StringToInteger(AString a_str, T& a_Num)
+{
+	size_t i = 0;
+	T positive = true;
+	T result = 0;
+	if (a_str[0] == '+')
+	{
+		i++;
+	}
+	else if (a_str[0] == '-')
+	{
+		i++;
+		positive = false;
+	}
+	if (positive)
+	{
+		for(; i <= a_str.size(); i++)
+		{
+			if ((a_str[i] <= '0') || (a_str[i] >= '9'))
+			{
+				return false;
+			}
+			if (std::numeric_limits<T>::max() / 10 < result)
+			{
+				return false;
+			}
+			result *= 10;
+			T digit = a_str[i] - '0';
+			if (std::numeric_limits<T>::max() - digit < result)
+			{
+				return false;
+			}
+			result += digit;
+		}
+	}
+	else
+	{
+		for(; i <= a_str.size(); i++)
+		{
+			if ((a_str[i] <= '0') || (a_str[i] >= '9'))
+			{
+				return false;
+			}
+			if (std::numeric_limits<T>::min() / 10 > result)
+			{
+				return false;
+			}
+			result *= 10;
+			T digit = a_str[i] - '0';
+			if (std::numeric_limits<T>::min() + digit > result)
+			{
+				return false;
+			}
+			result -= digit;
+		}
+	}
+	a_Num = result;
+	return true;
+}
+
 // If you have any other string helper functions, declare them here
 
 

From fecd607d7496d77a488757871a5abe60f789572b Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 13 Aug 2014 13:15:29 +0100
Subject: [PATCH 04/21] Added missing header

---
 src/StringUtils.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/StringUtils.h b/src/StringUtils.h
index 56ac83942..30a193845 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include <string>
+#include <limits>
 
 
 

From f4d268636a02346acc46c993666fe02bbc1ff0b8 Mon Sep 17 00:00:00 2001
From: Tycho <work.tycho+git@gmail.com>
Date: Wed, 13 Aug 2014 13:37:07 +0100
Subject: [PATCH 05/21] Fixed comments

---
 src/StringUtils.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/StringUtils.h b/src/StringUtils.h
index 30a193845..a78f8b0bf 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -100,12 +100,12 @@ extern int GetBEInt(const char * a_Mem);
 /// Writes four bytes to the specified memory location so that they interpret as BigEndian int
 extern void SetBEInt(char * a_Mem, Int32 a_Value);
 
-/// Parses any integer type. Checks bounds and 
+/// Parses any integer type. Checks bounds and returns errors out of band.
 template<class T>
-bool StringToInteger(AString a_str, T& a_Num)
+bool StringToInteger(const AString& a_str, T& a_Num)
 {
 	size_t i = 0;
-	T positive = true;
+	bool positive = true;
 	T result = 0;
 	if (a_str[0] == '+')
 	{
@@ -118,7 +118,7 @@ bool StringToInteger(AString a_str, T& a_Num)
 	}
 	if (positive)
 	{
-		for(; i <= a_str.size(); i++)
+		for(size_t size = a_str.size(); i < size; i++)
 		{
 			if ((a_str[i] <= '0') || (a_str[i] >= '9'))
 			{
@@ -139,7 +139,7 @@ bool StringToInteger(AString a_str, T& a_Num)
 	}
 	else
 	{
-		for(; i <= a_str.size(); i++)
+		for(size_t size = a_str.size(); i < size; i++)
 		{
 			if ((a_str[i] <= '0') || (a_str[i] >= '9'))
 			{

From a544c0238ba4c94d78692a7592107f8e510893ee Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 18:53:23 +0200
Subject: [PATCH 06/21] Implement ability to push minecarts on curved rails

---
 src/Entities/Minecart.cpp | 74 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 3 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index d4eadc5d5..19eaa207f 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -871,11 +871,79 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			return true;
 		}
 		case E_META_RAIL_CURVED_ZM_XM:
-		case E_META_RAIL_CURVED_ZM_XP:
-		case E_META_RAIL_CURVED_ZP_XM:
 		case E_META_RAIL_CURVED_ZP_XP:
 		{
-			// TODO - simply can't be bothered right now
+			Vector3d Distance(
+				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
+				0,
+				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
+			);
+
+			if ( Distance.z == 0. ) Distance.z = 0.0001;
+						if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
+			{
+				if ( (-GetSpeedX() * 0.4) < 0.01 )
+				{
+					AddSpeedX( -4/sqrt(2) );
+					AddSpeedZ( 4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( -GetSpeedX() * 0.4 );
+					SetSpeedZ( GetSpeedZ() * 0.4 );
+				}
+			}
+			else
+			{
+				if ((GetSpeedX() * 0.4) < 0.01)
+				{
+					AddSpeedX( 4/sqrt(2) );
+					AddSpeedZ( -4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( GetSpeedX() * 0.4 );
+					SetSpeedZ( -GetSpeedZ() * 0.4 );
+				}
+			}
+			break;
+		}
+		case E_META_RAIL_CURVED_ZM_XP:
+		case E_META_RAIL_CURVED_ZP_XM:
+		{
+			Vector3d Distance(
+				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
+				0,
+				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
+			);
+
+			if ( Distance.z == 0. ) Distance.z = 0.0001;
+			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((Distance.z<0)&&((Distance.x/Distance.z)>=-1)) )
+			{
+				if ( (GetSpeedX() * 0.4) < 0.01 )
+				{
+					AddSpeedX( 4/sqrt(2) );
+					AddSpeedZ( 4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( GetSpeedX() * 0.4 );
+					SetSpeedZ( GetSpeedZ() * 0.4 );
+				}
+			}
+			else
+			{
+				if ((-GetSpeedX() * 0.4) < 0.01)
+				{
+					AddSpeedX( -4/sqrt(2) );
+					AddSpeedZ( -4/sqrt(2) );
+				}
+				else
+				{
+					SetSpeedX( -GetSpeedX() * 0.4 );
+					SetSpeedZ( -GetSpeedZ() * 0.4 );
+				}
+			}
 			break;
 		}
 		default: break;

From 3698c5c8295e6a6a0f37b17f3c04bb118cc58bf6 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 19:16:00 +0200
Subject: [PATCH 07/21] Fixed braces and intendation errors

---
 src/Entities/Minecart.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 19eaa207f..5cf56d3d2 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -879,8 +879,12 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. ) Distance.z = 0.0001;
-						if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
+			if ( Distance.z == 0. )
+			{
+			Distance.z = 0.0001;
+			}
+			
+			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
 			{
 				if ( (-GetSpeedX() * 0.4) < 0.01 )
 				{
@@ -917,7 +921,11 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. ) Distance.z = 0.0001;
+			if ( Distance.z == 0. )
+			{
+				Distance.z = 0.0001;
+			}
+
 			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((Distance.z<0)&&((Distance.x/Distance.z)>=-1)) )
 			{
 				if ( (GetSpeedX() * 0.4) < 0.01 )

From 3f117897fbda4eec95ad5cdd728f197840dd7224 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 19:18:11 +0200
Subject: [PATCH 08/21] Another intendation error

---
 src/Entities/Minecart.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 5cf56d3d2..cd5e2adaa 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -881,9 +881,9 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 
 			if ( Distance.z == 0. )
 			{
-			Distance.z = 0.0001;
+				Distance.z = 0.0001;
 			}
-			
+
 			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
 			{
 				if ( (-GetSpeedX() * 0.4) < 0.01 )

From 2d2d4ff33b74eefe053cce4d9a5daada65ed496b Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Wed, 13 Aug 2014 19:47:43 +0200
Subject: [PATCH 09/21] Further fixing of coding style errors

---
 src/Entities/Minecart.cpp | 48 ++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index cd5e2adaa..45b9782f3 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -879,14 +879,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. )
+			if (Distance.z == 0.)
 			{
 				Distance.z = 0.0001;
 			}
 
-			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)>=1)) || ((Distance.z<0)&&((Distance.x/Distance.z)<=1)) )
+			if (((Distance.z >= 0) && ((Distance.x / Distance.z) >= 1)) ||
+				((Distance.z<0) && ((Distance.x / Distance.z) <= 1)))
 			{
-				if ( (-GetSpeedX() * 0.4) < 0.01 )
+				if ((-GetSpeedX() * 0.4) < 0.01)
 				{
 					AddSpeedX( -4/sqrt(2) );
 					AddSpeedZ( 4/sqrt(2) );
@@ -897,18 +898,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 					SetSpeedZ( GetSpeedZ() * 0.4 );
 				}
 			}
+			else if ((GetSpeedX() * 0.4) < 0.01)
+			{
+				AddSpeedX( 4/sqrt(2) );
+				AddSpeedZ( -4/sqrt(2) );
+			}
 			else
 			{
-				if ((GetSpeedX() * 0.4) < 0.01)
-				{
-					AddSpeedX( 4/sqrt(2) );
-					AddSpeedZ( -4/sqrt(2) );
-				}
-				else
-				{
-					SetSpeedX( GetSpeedX() * 0.4 );
-					SetSpeedZ( -GetSpeedZ() * 0.4 );
-				}
+				SetSpeedX( GetSpeedX() * 0.4 );
+				SetSpeedZ( -GetSpeedZ() * 0.4 );
 			}
 			break;
 		}
@@ -921,14 +919,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
 			);
 
-			if ( Distance.z == 0. )
+			if (Distance.z == 0.)
 			{
 				Distance.z = 0.0001;
 			}
 
-			if (  ((Distance.z>=0)&&((Distance.x/Distance.z)<=-1)) || ((Distance.z<0)&&((Distance.x/Distance.z)>=-1)) )
+			if (((Distance.z >= 0) && ((Distance.x / Distance.z) <= -1)) ||
+				((Distance.z<0) && ((Distance.x / Distance.z) >= -1)))
 			{
-				if ( (GetSpeedX() * 0.4) < 0.01 )
+				if ((GetSpeedX() * 0.4) < 0.01)
 				{
 					AddSpeedX( 4/sqrt(2) );
 					AddSpeedZ( 4/sqrt(2) );
@@ -939,18 +938,15 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 					SetSpeedZ( GetSpeedZ() * 0.4 );
 				}
 			}
+			else if ((-GetSpeedX() * 0.4) < 0.01)
+			{
+				AddSpeedX( -4/sqrt(2) );
+				AddSpeedZ( -4/sqrt(2) );
+			}
 			else
 			{
-				if ((-GetSpeedX() * 0.4) < 0.01)
-				{
-					AddSpeedX( -4/sqrt(2) );
-					AddSpeedZ( -4/sqrt(2) );
-				}
-				else
-				{
-					SetSpeedX( -GetSpeedX() * 0.4 );
-					SetSpeedZ( -GetSpeedZ() * 0.4 );
-				}
+				SetSpeedX( -GetSpeedX() * 0.4 );
+				SetSpeedZ( -GetSpeedZ() * 0.4 );
 			}
 			break;
 		}

From e3a74f379fc103f40e6bf85e626d7bac7db236af Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Thu, 14 Aug 2014 14:29:46 +0200
Subject: [PATCH 10/21] Further changes in coding style

---
 src/Entities/Minecart.cpp | 66 +++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 38 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 45b9782f3..8e11d8a07 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -873,80 +873,70 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 		case E_META_RAIL_CURVED_ZM_XM:
 		case E_META_RAIL_CURVED_ZP_XP:
 		{
-			Vector3d Distance(
-				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
-				0,
-				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
-			);
+			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
-			if (Distance.z == 0.)
-			{
-				Distance.z = 0.0001;
-			}
+			Distance.z = std::max(Distance.z, 0.001);
 
-			if (((Distance.z >= 0) && ((Distance.x / Distance.z) >= 1)) ||
-				((Distance.z<0) && ((Distance.x / Distance.z) <= 1)))
+			if (
+				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
+				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
+			)
 			{
 				if ((-GetSpeedX() * 0.4) < 0.01)
 				{
-					AddSpeedX( -4/sqrt(2) );
-					AddSpeedZ( 4/sqrt(2) );
+					AddSpeedX(-4/sqrt(2));
+					AddSpeedZ(4/sqrt(2));
 				}
 				else
 				{
-					SetSpeedX( -GetSpeedX() * 0.4 );
-					SetSpeedZ( GetSpeedZ() * 0.4 );
+					SetSpeedX(-GetSpeedX() * 0.4);
+					SetSpeedZ(GetSpeedZ() * 0.4);
 				}
 			}
 			else if ((GetSpeedX() * 0.4) < 0.01)
 			{
-				AddSpeedX( 4/sqrt(2) );
-				AddSpeedZ( -4/sqrt(2) );
+				AddSpeedX(4/sqrt(2));
+				AddSpeedZ(-4/sqrt(2));
 			}
 			else
 			{
-				SetSpeedX( GetSpeedX() * 0.4 );
-				SetSpeedZ( -GetSpeedZ() * 0.4 );
+				SetSpeedX(GetSpeedX() * 0.4);
+				SetSpeedZ(-GetSpeedZ() * 0.4);
 			}
 			break;
 		}
 		case E_META_RAIL_CURVED_ZM_XP:
 		case E_META_RAIL_CURVED_ZP_XM:
 		{
-			Vector3d Distance(
-				MinecartCollisionCallback.GetCollidedEntityPosition().x - GetPosX(),
-				0,
-				MinecartCollisionCallback.GetCollidedEntityPosition().z - GetPosZ()
-			);
+			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
-			if (Distance.z == 0.)
-			{
-				Distance.z = 0.0001;
-			}
+			Distance.z = std::max(Distance.z, 0.001);
 
-			if (((Distance.z >= 0) && ((Distance.x / Distance.z) <= -1)) ||
-				((Distance.z<0) && ((Distance.x / Distance.z) >= -1)))
+			if (
+				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
+				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
+			)
 			{
 				if ((GetSpeedX() * 0.4) < 0.01)
 				{
-					AddSpeedX( 4/sqrt(2) );
-					AddSpeedZ( 4/sqrt(2) );
+					AddSpeedX(4/sqrt(2));
+					AddSpeedZ(4/sqrt(2));
 				}
 				else
 				{
-					SetSpeedX( GetSpeedX() * 0.4 );
-					SetSpeedZ( GetSpeedZ() * 0.4 );
+					SetSpeedX(GetSpeedX() * 0.4);
+					SetSpeedZ(GetSpeedZ() * 0.4);
 				}
 			}
 			else if ((-GetSpeedX() * 0.4) < 0.01)
 			{
-				AddSpeedX( -4/sqrt(2) );
-				AddSpeedZ( -4/sqrt(2) );
+				AddSpeedX(-4/sqrt(2));
+				AddSpeedZ(-4/sqrt(2));
 			}
 			else
 			{
-				SetSpeedX( -GetSpeedX() * 0.4 );
-				SetSpeedZ( -GetSpeedZ() * 0.4 );
+				SetSpeedX(-GetSpeedX() * 0.4);
+				SetSpeedZ(-GetSpeedZ() * 0.4);
 			}
 			break;
 		}

From 0f631febfc3f670e8e9eb60ec4f89659ad7d0c71 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 13:40:56 +0200
Subject: [PATCH 11/21] Add some comments

---
 src/Entities/Minecart.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 8e11d8a07..0455c9ab3 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -875,17 +875,23 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 		{
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
+			// Prevent division by small numbers
 			Distance.z = std::max(Distance.z, 0.001);
 
+			/* Check to which side the minecart is to be pushed.
+			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
+			The minecart moves along the line z = -x, the perpendicular line to this is z = x.
+			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located.
+			*/
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
 			{
-				if ((-GetSpeedX() * 0.4) < 0.01)
+				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
 				{
-					AddSpeedX(-4/sqrt(2));
-					AddSpeedZ(4/sqrt(2));
+					AddSpeedX(-4 / sqrt(2));
+					AddSpeedZ(4 / sqrt(2));
 				}
 				else
 				{
@@ -893,10 +899,10 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 					SetSpeedZ(GetSpeedZ() * 0.4);
 				}
 			}
-			else if ((GetSpeedX() * 0.4) < 0.01)
+			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
 			{
-				AddSpeedX(4/sqrt(2));
-				AddSpeedZ(-4/sqrt(2));
+				AddSpeedX(4 / sqrt(2));
+				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
 			{
@@ -910,8 +916,13 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 		{
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
+			// Prevent division by small numbers
 			Distance.z = std::max(Distance.z, 0.001);
 
+			/* Check to which side the minecart is to be pushed.
+			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
+			The minecart moves along the line z = x, the perpendicular line to this is z = -x.
+			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
@@ -919,8 +930,8 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			{
 				if ((GetSpeedX() * 0.4) < 0.01)
 				{
-					AddSpeedX(4/sqrt(2));
-					AddSpeedZ(4/sqrt(2));
+					AddSpeedX(4 / sqrt(2));
+					AddSpeedZ(4 / sqrt(2));
 				}
 				else
 				{
@@ -930,8 +941,8 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			}
 			else if ((-GetSpeedX() * 0.4) < 0.01)
 			{
-				AddSpeedX(-4/sqrt(2));
-				AddSpeedZ(-4/sqrt(2));
+				AddSpeedX(-4 / sqrt(2));
+				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
 			{

From be03b84048a49e04db11aa6ce80b3d18fff313b1 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 13:43:45 +0200
Subject: [PATCH 12/21] End of comment moved away from new line

---
 src/Entities/Minecart.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 0455c9ab3..f190d972e 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -881,8 +881,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
 			The minecart moves along the line z = -x, the perpendicular line to this is z = x.
-			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located.
-			*/
+			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))

From c473d8cfb82009411f5a3977b7041ee49ba08003 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 14:00:51 +0200
Subject: [PATCH 13/21] Clarify comment message

---
 src/Entities/Minecart.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index f190d972e..4753f720d 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -880,7 +880,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
-			The minecart moves along the line z = -x, the perpendicular line to this is z = x.
+			The minecart moves along the line x = -z, the perpendicular line to this is x = z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
@@ -920,7 +920,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
-			The minecart moves along the line z = x, the perpendicular line to this is z = -x.
+			The minecart moves along the line x = z, the perpendicular line to this is x = -z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
 			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||

From 72c02ceb171949acd07338e77c8ee0d3439f8173 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Fri, 15 Aug 2014 17:54:43 +0200
Subject: [PATCH 14/21] Added a lot of comments

---
 src/Entities/Minecart.cpp | 66 +++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 4753f720d..9420eca02 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -876,7 +876,10 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
 			// Prevent division by small numbers
-			Distance.z = std::max(Distance.z, 0.001);
+			if (abs(Distance.z) < 0.001)
+			{
+				Distance.z = 0.001;
+			}
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
@@ -886,27 +889,27 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
-			{
-				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-				{
+			{ // Moving -X + Z
+				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ speedX >= 0
+				{ // Immobile or not moving in the "right" direction. Give it a bump!
 					AddSpeedX(-4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else
-				{
-					SetSpeedX(-GetSpeedX() * 0.4);
-					SetSpeedZ(GetSpeedZ() * 0.4);
+				else // ~ SpeedX < 0
+				{ // Moving in the "right" direction. Only accelerate it a bit.
+					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			}
-			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-			{
+			} // Moving +X -Z
+			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ SpeedX <= 0
+			{ // Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else
-			{
-				SetSpeedX(GetSpeedX() * 0.4);
-				SetSpeedZ(-GetSpeedZ() * 0.4);
+			else // ~ SpeedX > 0
+			{ // Moving in the "right" direction
+				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
 			break;
 		}
@@ -916,37 +919,40 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			Vector3d Distance = MinecartCollisionCallback.GetCollidedEntityPosition() - Vector3d(GetPosX(), 0, GetPosZ());
 
 			// Prevent division by small numbers
-			Distance.z = std::max(Distance.z, 0.001);
+			if (abs(Distance.z) < 0.001)
+			{
+				Distance.z = 0.001;
+			}
 
 			/* Check to which side the minecart is to be pushed.
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
 			The minecart moves along the line x = z, the perpendicular line to this is x = -z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
-			if (
+			if ( // Moving +X +Z
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
 			)
 			{
-				if ((GetSpeedX() * 0.4) < 0.01)
-				{
+				if ((GetSpeedX() * 0.4) < 0.01) // ~ SpeedX <= 0
+				{ // Immobile or not moving in the "right" direction
 					AddSpeedX(4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else
-				{
-					SetSpeedX(GetSpeedX() * 0.4);
-					SetSpeedZ(GetSpeedZ() * 0.4);
+				else // SpeedX > 0
+				{ // Moving in the "right" direction
+					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			}
-			else if ((-GetSpeedX() * 0.4) < 0.01)
-			{
+			} // Moving -X -Z
+			else if ((-GetSpeedX() * 0.4) < 0.01) // ~ SpeedX >= 0
+			{ // Immobile or not moving in the "right" direction
 				AddSpeedX(-4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else
-			{
-				SetSpeedX(-GetSpeedX() * 0.4);
-				SetSpeedZ(-GetSpeedZ() * 0.4);
+			else // ~ SpeedX < 0
+			{ // Moving in the "right" direction
+				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
+				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
 			break;
 		}

From c70886a7124e5940b67cb4f1b4593f103f2707d8 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Mon, 18 Aug 2014 01:57:44 +0200
Subject: [PATCH 15/21] Adjust comment formatting

---
 src/Entities/Minecart.cpp | 60 ++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 9420eca02..13469edb3 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -889,25 +889,35 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
-			{ // Moving -X + Z
-				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ speedX >= 0
-				{ // Immobile or not moving in the "right" direction. Give it a bump!
+			// Moving -X +Z
+			{
+				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
+				// ~ speedX >= 0
+				{
+					// Immobile or not moving in the "right" direction. Give it a bump!
 					AddSpeedX(-4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else // ~ SpeedX < 0
-				{ // Moving in the "right" direction. Only accelerate it a bit.
+				else
+				// ~ SpeedX < 0
+				{
+					// Moving in the "right" direction. Only accelerate it a bit.
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			} // Moving +X -Z
-			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01) // ~ SpeedX <= 0
-			{ // Immobile or not moving in the "right" direction
+			}
+			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
+			// Moving +X -Z
+			// ~ SpeedX <= 0
+			{
+				// Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else // ~ SpeedX > 0
-			{ // Moving in the "right" direction
+			else
+			// ~ SpeedX > 0
+			{
+				// Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
@@ -928,29 +938,39 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			Let's consider a z-x-coordinate system where the minecart is the center (0/0).
 			The minecart moves along the line x = z, the perpendicular line to this is x = -z.
 			In order to decide to which side the minecart is to be pushed, it must be checked on what side of the perpendicular line the pushing entity is located. */
-			if ( // Moving +X +Z
+			if (
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
 			)
+			// Moving +X +Z
 			{
-				if ((GetSpeedX() * 0.4) < 0.01) // ~ SpeedX <= 0
-				{ // Immobile or not moving in the "right" direction
+				if ((GetSpeedX() * 0.4) < 0.01)
+				// ~ SpeedX <= 0
+				{
+					// Immobile or not moving in the "right" direction
 					AddSpeedX(4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
-				else // SpeedX > 0
-				{ // Moving in the "right" direction
+				else
+				// SpeedX > 0
+				{
+					// Moving in the "right" direction
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
-			} // Moving -X -Z
-			else if ((-GetSpeedX() * 0.4) < 0.01) // ~ SpeedX >= 0
-			{ // Immobile or not moving in the "right" direction
+			}
+			else if ((-GetSpeedX() * 0.4) < 0.01)
+			// Moving -X -Z
+			// ~ SpeedX >= 0
+			{
+				// Immobile or not moving in the "right" direction
 				AddSpeedX(-4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
-			else // ~ SpeedX < 0
-			{ // Moving in the "right" direction
+			else
+			// ~ SpeedX < 0
+			{
+				// Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}

From a56634799e1fb7eef3d2817bd7d9c1b42969e934 Mon Sep 17 00:00:00 2001
From: Christophe Piveteau <chripiveteau@gmail.com>
Date: Sun, 24 Aug 2014 15:03:02 +0200
Subject: [PATCH 16/21] Change comment formatting

---
 src/Entities/Minecart.cpp | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index 13469edb3..f43c4d163 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -889,35 +889,31 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) >= 1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) <= 1))
 			)
-			// Moving -X +Z
 			{
+				// Moving -X +Z
 				if ((-GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-				// ~ speedX >= 0
 				{
-					// Immobile or not moving in the "right" direction. Give it a bump!
+					// ~ SpeedX >= 0 Immobile or not moving in the "right" direction. Give it a bump!
 					AddSpeedX(-4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
 				else
-				// ~ SpeedX < 0
 				{
-					// Moving in the "right" direction. Only accelerate it a bit.
+					// ~ SpeedX < 0 Moving in the "right" direction. Only accelerate it a bit.
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
 			}
 			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
-			// Moving +X -Z
-			// ~ SpeedX <= 0
 			{
-				// Immobile or not moving in the "right" direction
+				// Moving +X -T
+				// ~ SpeedX <= 0 Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
-			// ~ SpeedX > 0
 			{
-				// Moving in the "right" direction
+				// ~ SpeedX > 0 Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}
@@ -942,35 +938,31 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 				((Distance.z > 0) && ((Distance.x / Distance.z) <= -1)) ||
 				((Distance.z < 0) && ((Distance.x / Distance.z) >= -1))
 			)
-			// Moving +X +Z
 			{
+				// Moving +X +Z
 				if ((GetSpeedX() * 0.4) < 0.01)
-				// ~ SpeedX <= 0
 				{
-					// Immobile or not moving in the "right" direction
+					// ~ SpeedX <= 0 Immobile or not moving in the "right" direction
 					AddSpeedX(4 / sqrt(2));
 					AddSpeedZ(4 / sqrt(2));
 				}
 				else
-				// SpeedX > 0
 				{
-					// Moving in the "right" direction
+					// ~ SpeedX > 0 Moving in the "right" direction
 					SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 					SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 				}
 			}
 			else if ((-GetSpeedX() * 0.4) < 0.01)
-			// Moving -X -Z
-			// ~ SpeedX >= 0
 			{
-				// Immobile or not moving in the "right" direction
+				// Moving -X -Z
+				// ~ SpeedX >= 0 Immobile or not moving in the "right" direction
 				AddSpeedX(-4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));
 			}
 			else
-			// ~ SpeedX < 0
 			{
-				// Moving in the "right" direction
+				// ~ SpeedX < 0 Moving in the "right" direction
 				SetSpeedX(GetSpeedX() * 0.4 / sqrt(2));
 				SetSpeedZ(GetSpeedZ() * 0.4 / sqrt(2));
 			}

From 49ac6fadfc441e1de1a0127ff45996ac3abae150 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 28 Aug 2014 16:44:36 +0300
Subject: [PATCH 17/21] Fixed spaces after "template" keyword.

---
 src/Bindings/ManualBindings.cpp | 12 ++++++------
 src/Blocks/ClearMetaOnDrop.h    |  2 +-
 src/Blocks/MetaRotator.h        | 10 +++++-----
 src/OSSupport/Queue.h           |  2 +-
 src/StringUtils.h               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 6b40cece8..23651b0e1 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -301,11 +301,11 @@ static int tolua_cFile_GetFolderContents(lua_State * tolua_S)
 
 
 
-template<
+template <
 	class Ty1,
 	class Ty2,
 	bool (Ty1::*Func1)(const AString &, cItemCallback<Ty2> &)
-	>
+>
 static int tolua_DoWith(lua_State* tolua_S)
 {
 	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */
@@ -395,7 +395,7 @@ static int tolua_DoWith(lua_State* tolua_S)
 
 
 
-template<
+template <
 	class Ty1,
 	class Ty2,
 	bool (Ty1::*Func1)(int, cItemCallback<Ty2> &)
@@ -485,7 +485,7 @@ static int tolua_DoWithID(lua_State* tolua_S)
 
 
 
-template<
+template <
 	class Ty1,
 	class Ty2,
 	bool (Ty1::*Func1)(int, int, int, cItemCallback<Ty2> &)
@@ -580,7 +580,7 @@ static int tolua_DoWithXYZ(lua_State* tolua_S)
 
 
 
-template<
+template <
 	class Ty1,
 	class Ty2,
 	bool (Ty1::*Func1)(int, int, cItemCallback<Ty2> &)
@@ -676,7 +676,7 @@ static int tolua_ForEachInChunk(lua_State * tolua_S)
 
 
 
-template<
+template <
 	class Ty1,
 	class Ty2,
 	bool (Ty1::*Func1)(cItemCallback<Ty2> &)
diff --git a/src/Blocks/ClearMetaOnDrop.h b/src/Blocks/ClearMetaOnDrop.h
index f2afbc6ea..aa4f23848 100644
--- a/src/Blocks/ClearMetaOnDrop.h
+++ b/src/Blocks/ClearMetaOnDrop.h
@@ -7,7 +7,7 @@
 // For example to use in class Foo which should inherit Bar use
 // class Foo : public cClearMetaOnDrop<Bar>;
 
-template<class Base>
+template <class Base>
 class cClearMetaOnDrop : public Base
 {
 public:
diff --git a/src/Blocks/MetaRotator.h b/src/Blocks/MetaRotator.h
index 599aa7ef9..4c268077a 100644
--- a/src/Blocks/MetaRotator.h
+++ b/src/Blocks/MetaRotator.h
@@ -20,7 +20,7 @@ Usage:
 Inherit from this class providing your base class as Base, the BitMask for the direction bits in bitmask and the masked value for the directions in North, East, South, West. There is also an aptional parameter AssertIfNotMatched. Set this if it is invalid for a block to exist in any other state.
 */
 
-template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched = false>
+template <class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched = false>
 class cMetaRotator : public Base
 {
 public:
@@ -41,7 +41,7 @@ public:
 
 
 
-template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
+template <class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
 NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaRotateCW(NIBBLETYPE a_Meta)
 {
 	NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
@@ -63,7 +63,7 @@ NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatc
 
 
 
-template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
+template <class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
 NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaRotateCCW(NIBBLETYPE a_Meta)
 {
 	NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
@@ -85,7 +85,7 @@ NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatc
 
 
 
-template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
+template <class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
 NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaMirrorXY(NIBBLETYPE a_Meta)
 {
 	NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
@@ -102,7 +102,7 @@ NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatc
 
 
 
-template<class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
+template <class Base, NIBBLETYPE BitMask, NIBBLETYPE North, NIBBLETYPE East, NIBBLETYPE South, NIBBLETYPE West, bool AssertIfNotMatched>
 NIBBLETYPE cMetaRotator<Base, BitMask, North, East, South, West, AssertIfNotMatched>::MetaMirrorYZ(NIBBLETYPE a_Meta)
 {
 	NIBBLETYPE OtherMeta = a_Meta & (~BitMask);
diff --git a/src/OSSupport/Queue.h b/src/OSSupport/Queue.h
index bf4d7f004..8d096fe29 100644
--- a/src/OSSupport/Queue.h
+++ b/src/OSSupport/Queue.h
@@ -20,7 +20,7 @@ cQueueFuncs and is used as the default behavior.
 */
 
 /// This empty struct allows for the callback functions to be inlined
-template<class T>
+template <class T>
 struct cQueueFuncs
 {
 public:
diff --git a/src/StringUtils.h b/src/StringUtils.h
index a78f8b0bf..7699a18bd 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -101,7 +101,7 @@ extern int GetBEInt(const char * a_Mem);
 extern void SetBEInt(char * a_Mem, Int32 a_Value);
 
 /// Parses any integer type. Checks bounds and returns errors out of band.
-template<class T>
+template <class T>
 bool StringToInteger(const AString& a_str, T& a_Num)
 {
 	size_t i = 0;

From 9b68ff2656d5e662d33c670ee5fa20dd12b8264f Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 28 Aug 2014 16:53:26 +0300
Subject: [PATCH 18/21] CheckBasicStyle: Added checking for the "template"
 keyword.

---
 src/CheckBasicStyle.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index bf81a7cd5..b244b1fbc 100644
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -108,7 +108,7 @@ local g_ViolationPatterns =
 	
 	-- Check that all commas have spaces after them and not in front of them:
 	{" ,", "Extra space before a \",\""},
-	{",[^%s\"%%]", "Needs a space after a \",\""},  -- Report all except >> "," << needed for splitting and >>,%s<< needed for formatting
+	{",[^%s\"%%\']", "Needs a space after a \",\""},  -- Report all except >> "," << needed for splitting and >>,%s<< needed for formatting
 	
 	-- Check that opening braces are not at the end of a code line:
 	{"[^%s].-{\n?$", "Brace should be on a separate line"},
@@ -119,6 +119,7 @@ local g_ViolationPatterns =
 	{"while%(", "Needs a space after \"while\""},
 	{"switch%(", "Needs a space after \"switch\""},
 	{"catch%(", "Needs a space after \"catch\""},
+	{"template<", "Needs a space after \"template\""},
 	
 	-- No space after keyword's parenthesis:
 	{"[^%a#]if %( ", "Remove the space after \"(\""},

From 271c8c0d3246749087f9772df31896d93f2cb9f3 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 28 Aug 2014 16:58:48 +0300
Subject: [PATCH 19/21] More template keyword fixes.

---
 src/BlockArea.cpp   | 18 +++++++++---------
 src/BlockArea.h     |  2 +-
 src/Defines.h       |  2 +-
 src/LinearUpscale.h |  6 +++---
 src/StringUtils.h   |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index 90f7ca6c9..ba55528b8 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -28,7 +28,7 @@ typedef void (CombinatorFunc)(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLE
 
 // This wild construct allows us to pass a function argument and still have it inlined by the compiler :)
 /// Merges two blocktypes and blockmetas of the specified sizes and offsets using the specified combinator function
-template<bool MetasValid, CombinatorFunc Combinator>
+template <bool MetasValid, CombinatorFunc Combinator>
 void InternalMergeBlocks(
 	BLOCKTYPE * a_DstTypes, const BLOCKTYPE * a_SrcTypes,
 	NIBBLETYPE * a_DstMetas, const NIBBLETYPE * a_SrcMetas,
@@ -74,7 +74,7 @@ void InternalMergeBlocks(
 
 
 /// Combinator used for cBlockArea::msOverwrite merging
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorOverwrite(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	a_DstType = a_SrcType;
@@ -89,7 +89,7 @@ void MergeCombinatorOverwrite(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLE
 
 
 /// Combinator used for cBlockArea::msFillAir merging
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorFillAir(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	if (a_DstType == E_BLOCK_AIR)
@@ -108,7 +108,7 @@ void MergeCombinatorFillAir(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETY
 
 
 /// Combinator used for cBlockArea::msImprint merging
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorImprint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	if (a_SrcType != E_BLOCK_AIR)
@@ -127,7 +127,7 @@ void MergeCombinatorImprint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETY
 
 
 /// Combinator used for cBlockArea::msLake merging
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	// Sponge is the NOP block
@@ -201,7 +201,7 @@ void MergeCombinatorLake(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE
 
 
 /** Combinator used for cBlockArea::msSpongePrint merging */
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorSpongePrint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	// Sponge overwrites nothing, everything else overwrites anything
@@ -220,7 +220,7 @@ void MergeCombinatorSpongePrint(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBB
 
 
 /** Combinator used for cBlockArea::msDifference merging */
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorDifference(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	if ((a_DstType == a_SrcType) && (!MetaValid || (a_DstMeta == a_SrcMeta)))
@@ -246,7 +246,7 @@ void MergeCombinatorDifference(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBL
 
 
 /** Combinator used for cBlockArea::msMask merging */
-template<bool MetaValid>
+template <bool MetaValid>
 void MergeCombinatorMask(BLOCKTYPE & a_DstType, BLOCKTYPE a_SrcType, NIBBLETYPE & a_DstMeta, NIBBLETYPE a_SrcMeta)
 {
 	// If the blocks are the same, keep the dest; otherwise replace with air
@@ -2121,7 +2121,7 @@ void cBlockArea::RelSetData(
 
 
 
-template<bool MetasValid>
+template <bool MetasValid>
 void cBlockArea::MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_RelY, int a_RelZ, eMergeStrategy a_Strategy, const NIBBLETYPE * SrcMetas, NIBBLETYPE * DstMetas)
 {
 	// Block types are compulsory, block metas are voluntary
diff --git a/src/BlockArea.h b/src/BlockArea.h
index a95ba7788..86f7c4f2d 100644
--- a/src/BlockArea.h
+++ b/src/BlockArea.h
@@ -362,7 +362,7 @@ protected:
 		NIBBLETYPE a_BlockLight, NIBBLETYPE a_BlockSkyLight
 	);
 	
-	template<bool MetasValid>
+	template <bool MetasValid>
 	void MergeByStrategy(const cBlockArea & a_Src, int a_RelX, int a_RelY, int a_RelZ, eMergeStrategy a_Strategy, const NIBBLETYPE * SrcMetas, NIBBLETYPE * DstMetas);
 	// tolua_begin
 } ;
diff --git a/src/Defines.h b/src/Defines.h
index 0981077c4..78c58034e 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -528,7 +528,7 @@ inline float GetSpecialSignf( float a_Val)
 
 
 
-template<class T> inline T Diff(T a_Val1, T a_Val2)
+template <class T> inline T Diff(T a_Val1, T a_Val2)
 {
 	return std::abs(a_Val1 - a_Val2);
 }
diff --git a/src/LinearUpscale.h b/src/LinearUpscale.h
index 0b04408cf..a49f4bdf9 100644
--- a/src/LinearUpscale.h
+++ b/src/LinearUpscale.h
@@ -31,7 +31,7 @@ Linearly interpolates values in the array between the equidistant anchor points
 Works in-place (input is already present at the correct output coords)
 Uses templates to make it possible for the compiler to further optimizer the loops
 */
-template<
+template <
 	int SizeX, int SizeY,  // Dimensions of the array
 	int AnchorStepX, int AnchorStepY,
 	typename TYPE
@@ -83,7 +83,7 @@ void LinearUpscale2DArrayInPlace(TYPE * a_Array)
 Linearly interpolates values in the array between the equidistant anchor points (upscales).
 Works on two arrays, input is packed and output is to be completely constructed.
 */
-template<typename TYPE> void LinearUpscale2DArray(
+template <typename TYPE> void LinearUpscale2DArray(
 	TYPE * a_Src,                    ///< Source array of size a_SrcSizeX x a_SrcSizeY
 	int a_SrcSizeX, int a_SrcSizeY,  ///< Dimensions of the src array
 	TYPE * a_Dst,                    ///< Dest array, of size (a_SrcSizeX * a_UpscaleX + 1) x (a_SrcSizeY * a_UpscaleY + 1)
@@ -153,7 +153,7 @@ template<typename TYPE> void LinearUpscale2DArray(
 Linearly interpolates values in the array between the equidistant anchor points (upscales).
 Works on two arrays, input is packed and output is to be completely constructed.
 */
-template<typename TYPE> void LinearUpscale3DArray(
+template <typename TYPE> void LinearUpscale3DArray(
 	TYPE * a_Src,                                    ///< Source array of size a_SrcSizeX x a_SrcSizeY x a_SrcSizeZ
 	int a_SrcSizeX, int a_SrcSizeY, int a_SrcSizeZ,  ///< Dimensions of the src array
 	TYPE * a_Dst,                                    ///< Dest array, of size (a_SrcSizeX * a_UpscaleX + 1) x (a_SrcSizeY * a_UpscaleY + 1) x (a_SrcSizeZ * a_UpscaleZ + 1)
diff --git a/src/StringUtils.h b/src/StringUtils.h
index a63d852ee..4a4c267c7 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -117,7 +117,7 @@ bool StringToInteger(const AString& a_str, T& a_Num)
 	}
 	if (positive)
 	{
-		for(size_t size = a_str.size(); i < size; i++)
+		for (size_t size = a_str.size(); i < size; i++)
 		{
 			if ((a_str[i] <= '0') || (a_str[i] >= '9'))
 			{
@@ -138,7 +138,7 @@ bool StringToInteger(const AString& a_str, T& a_Num)
 	}
 	else
 	{
-		for(size_t size = a_str.size(); i < size; i++)
+		for (size_t size = a_str.size(); i < size; i++)
 		{
 			if ((a_str[i] <= '0') || (a_str[i] >= '9'))
 			{

From d74e49ddc00095589cfefb29ceb23da13f3e5f0a Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 28 Aug 2014 17:01:59 +0300
Subject: [PATCH 20/21] Final template keyword style fix.

---
 src/AllocationPool.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/AllocationPool.h b/src/AllocationPool.h
index 3c9dbe8c9..61431a548 100644
--- a/src/AllocationPool.h
+++ b/src/AllocationPool.h
@@ -3,7 +3,7 @@
 
 #include <memory>
 
-template<class T>
+template <class T>
 class cAllocationPool
 {
 public:
@@ -34,7 +34,7 @@ public:
 
 /** Allocates memory storing unused elements in a linked list. Keeps at least NumElementsInReserve
 elements in the list unless malloc fails so that the program has a reserve to handle OOM.**/
-template<class T, size_t NumElementsInReserve>
+template <class T, size_t NumElementsInReserve>
 class cListAllocationPool : public cAllocationPool<T>
 {
 	public:

From 1c136a60478811dabfb54e89a27fb1229d0d1b49 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Thu, 28 Aug 2014 17:04:26 +0300
Subject: [PATCH 21/21] Fixed a typo.

---
 src/Entities/Minecart.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entities/Minecart.cpp b/src/Entities/Minecart.cpp
index f43c4d163..21c58fdba 100644
--- a/src/Entities/Minecart.cpp
+++ b/src/Entities/Minecart.cpp
@@ -906,7 +906,7 @@ bool cMinecart::TestEntityCollision(NIBBLETYPE a_RailMeta)
 			}
 			else if ((GetSpeedX() * 0.4 / sqrt(2)) < 0.01)
 			{
-				// Moving +X -T
+				// Moving +X -Z
 				// ~ SpeedX <= 0 Immobile or not moving in the "right" direction
 				AddSpeedX(4 / sqrt(2));
 				AddSpeedZ(-4 / sqrt(2));