1 files changed, 69 insertions, 45 deletions

diff --git a/src/FurnaceRecipe.cpp b/src/FurnaceRecipe.cpp
index 92b52c6e8..f8949d45f 100644
--- a/src/FurnaceRecipe.cpp
+++ b/src/FurnaceRecipe.cpp
@@ -68,64 +68,88 @@ void cFurnaceRecipe::ReloadRecipes(void)
 	while (std::getline(f, ParsingLine))
 	{
 		Line++;
-		ParsingLine.erase(std::remove_if(ParsingLine.begin(), ParsingLine.end(), isspace), ParsingLine.end()); // Remove whitespace
+		TrimString(ParsingLine);
 		if (ParsingLine.empty())
 		{
 			continue;
 		}
 
-		// Comments
-		if (ParsingLine[0] == '#')
+		switch (ParsingLine[0])
 		{
-			continue;
-		}
-
-		if (ParsingLine[0] == '!') // Fuels start with a bang :)
-		{
-			int IItemID = 0, IItemCount = 0, IItemHealth = 0, IBurnTime = 0;
-			AString::size_type BeginPos = 1; // Begin at one after exclamation mark (bang)
-
-			if (
-				!ReadMandatoryNumber(BeginPos, ":", ParsingLine, Line, IItemID) || // Read item ID
-				!ReadOptionalNumbers(BeginPos, ":", "=", ParsingLine, Line, IItemCount, IItemHealth) || // Read item count (and optionally health)
-				!ReadMandatoryNumber(BeginPos, "0123456789", ParsingLine, Line, IBurnTime, true) // Read item burn time - last value
-				)
+			case '#':
 			{
-				return;
+				// Comment
+				break;
 			}
 
-			// Add to fuel list
-			Fuel F;
-			F.In = new cItem((ENUM_ITEM_ID)IItemID, (char)IItemCount, (short)IItemHealth);
-			F.BurnTime = IBurnTime;
-			m_pState->Fuel.push_back(F);
-			continue;
-		}
-		else if (isdigit(ParsingLine[0])) // Recipes start with a numeral :)
-		{
-			int IItemID = 0, IItemCount = 0, IItemHealth = 0, IBurnTime = 0;
-			int OItemID = 0, OItemCount = 0, OItemHealth = 0;
-			AString::size_type BeginPos = 0; // Begin at start of line
-
-			if (
-				!ReadMandatoryNumber(BeginPos, ":", ParsingLine, Line, IItemID) || // Read item ID
-				!ReadOptionalNumbers(BeginPos, ":", "@", ParsingLine, Line, IItemCount, IItemHealth) || // Read item count (and optionally health)
-				!ReadMandatoryNumber(BeginPos, "=", ParsingLine, Line, IBurnTime) || // Read item burn time
-				!ReadMandatoryNumber(BeginPos, ":", ParsingLine, Line, OItemID) || // Read result ID
-				!ReadOptionalNumbers(BeginPos, ":", "012456789", ParsingLine, Line, OItemCount, OItemHealth, true) // Read result count (and optionally health) - last value
+			case '!':
+			{
+				// Fuel
+				int IItemID = 0, IItemCount = 0, IItemHealth = 0, IBurnTime = 0;
+				AString::size_type BeginPos = 1; // Begin at one after exclamation mark (bang)
+
+				if (
+					!ReadMandatoryNumber(BeginPos, ":", ParsingLine, Line, IItemID) ||                       // Read item ID
+					!ReadOptionalNumbers(BeginPos, ":", "=", ParsingLine, Line, IItemCount, IItemHealth) ||  // Read item count (and optionally health)
+					!ReadMandatoryNumber(BeginPos, "0123456789", ParsingLine, Line, IBurnTime, true)         // Read item burn time - last value
 				)
+				{
+					return;
+				}
+
+				// Add to fuel list:
+				Fuel F;
+				F.In = new cItem((ENUM_ITEM_ID)IItemID, (char)IItemCount, (short)IItemHealth);
+				F.BurnTime = IBurnTime;
+				m_pState->Fuel.push_back(F);
+				break;
+			}
+
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
 			{
-				return;
+				// Recipe
+				int IItemID = 0, IItemCount = 0, IItemHealth = 0, IBurnTime = 0;
+				int OItemID = 0, OItemCount = 0, OItemHealth = 0;
+				AString::size_type BeginPos = 0; // Begin at start of line
+
+				if (
+					!ReadMandatoryNumber(BeginPos, ":", ParsingLine, Line, IItemID) ||                                  // Read item ID
+					!ReadOptionalNumbers(BeginPos, ":", "@", ParsingLine, Line, IItemCount, IItemHealth) ||             // Read item count (and optionally health)
+					!ReadMandatoryNumber(BeginPos, "=", ParsingLine, Line, IBurnTime) ||                                // Read item burn time
+					!ReadMandatoryNumber(BeginPos, ":", ParsingLine, Line, OItemID) ||                                  // Read result ID
+					!ReadOptionalNumbers(BeginPos, ":", "012456789", ParsingLine, Line, OItemCount, OItemHealth, true)  // Read result count (and optionally health) - last value
+				)
+				{
+					return;
+				}
+
+				// Add to recipe list
+				Recipe R;
+				R.In = new cItem((ENUM_ITEM_ID)IItemID, (char)IItemCount, (short)IItemHealth);
+				R.Out = new cItem((ENUM_ITEM_ID)OItemID, (char)OItemCount, (short)OItemHealth);
+				R.CookTime = IBurnTime;
+				m_pState->Recipes.push_back(R);
+				break;
 			}
 
-			// Add to recipe list
-			Recipe R;
-			R.In = new cItem((ENUM_ITEM_ID)IItemID, (char)IItemCount, (short)IItemHealth);
-			R.Out = new cItem((ENUM_ITEM_ID)OItemID, (char)OItemCount, (short)OItemHealth);
-			R.CookTime = IBurnTime;
-			m_pState->Recipes.push_back(R);
-		}
-	}
+			default:
+			{
+				LOGWARNING("Error in furnace recipes at line %d: Unexpected text: \"%s\". Ignoring line.",
+					Line, ParsingLine.c_str()
+				);
+				break;
+			}
+		}  // switch (ParsingLine[0])
+	}  // while (getline(ParsingLine))
 
 	LOG("Loaded " SIZE_T_FMT " furnace recipes and " SIZE_T_FMT " fuels", m_pState->Recipes.size(), m_pState->Fuel.size());
 }