From 35b79e5d710862f957bc494638a8d8906992665d Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 10 Jun 2014 20:43:27 +0100
Subject: Portal improvements and suggestions

---
 src/BlockID.cpp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'src/BlockID.cpp')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index bfe826f40..641a6a225 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -345,6 +345,41 @@ eDimension StringToDimension(const AString & a_DimensionString)
 
 
 
+AString DimensionToString(eDimension a_Dimension)
+{
+	// Decode using a built-in map:
+	static struct
+	{
+		eDimension m_Dimension;
+		const char * m_String;
+	} DimensionMap[] =
+	{
+		{ dimOverworld, "Overworld" },
+		{ dimOverworld, "Normal" },
+		{ dimOverworld, "World" },
+		{ dimNether, "Nether" },
+		{ dimNether, "Hell" },  // Alternate name for Nether
+		{ dimEnd, "End" },
+		{ dimEnd, "Sky" },  // Old name for End
+	};
+
+	for (size_t i = 0; i < ARRAYCOUNT(DimensionMap); i++)
+	{
+		if (DimensionMap[i].m_Dimension == a_Dimension)
+		{
+			return DimensionMap[i].m_String;
+		}
+	}  // for i - DimensionMap[]
+
+	// Not found
+	LOGWARNING("Unknown dimension: \"%i\". Setting to Overworld", (int)a_Dimension);
+	return "Overworld";
+}
+
+
+
+
+
 /// Translates damage type constant to a string representation (built-in).
 AString DamageTypeToString(eDamageType a_DamageType)
 {
-- 
cgit v1.2.3


From b2fbcaf1bf43ca1f0e6df48de8584149cbe50222 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Sun, 15 Jun 2014 20:27:27 -0700
Subject: Implemented PR suggestions

Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
---
 src/BlockID.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/BlockID.cpp')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index 641a6a225..70cb801b6 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -355,12 +355,8 @@ AString DimensionToString(eDimension a_Dimension)
 	} DimensionMap[] =
 	{
 		{ dimOverworld, "Overworld" },
-		{ dimOverworld, "Normal" },
-		{ dimOverworld, "World" },
 		{ dimNether, "Nether" },
-		{ dimNether, "Hell" },  // Alternate name for Nether
 		{ dimEnd, "End" },
-		{ dimEnd, "Sky" },  // Old name for End
 	};
 
 	for (size_t i = 0; i < ARRAYCOUNT(DimensionMap); i++)
-- 
cgit v1.2.3