From 4ad8891e0586f60a642675cc4d04edc3cd84650b Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 4 Dec 2011 01:16:22 +0200
Subject: Convert CraftItems directly to the name pointed by alias; necessary
 due to lua definition table

---
 src/craftitemdef.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/craftitemdef.cpp')

diff --git a/src/craftitemdef.cpp b/src/craftitemdef.cpp
index 8d4cbea3c..4461e38a7 100644
--- a/src/craftitemdef.cpp
+++ b/src/craftitemdef.cpp
@@ -88,12 +88,7 @@ public:
 	virtual const CraftItemDefinition* getCraftItemDefinition(const std::string &itemname_) const
 	{
 		// Convert name according to possible alias
-		std::string itemname = itemname_;
-		std::map<std::string, std::string>::const_iterator i;
-		i = m_aliases.find(itemname);
-		if(i != m_aliases.end()){
-			itemname = i->second;
-		}
+		std::string itemname = getAlias(itemname_);
 		// Get the definition
 		core::map<std::string, CraftItemDefinition*>::Node *n;
 		n = m_item_definitions.find(itemname);
@@ -108,6 +103,14 @@ public:
 			return "";
 		return def->imagename;
 	}
+	virtual std::string getAlias(const std::string &name) const
+	{
+		std::map<std::string, std::string>::const_iterator i;
+		i = m_aliases.find(name);
+		if(i != m_aliases.end())
+			return i->second;
+		return name;
+	}
 	virtual bool registerCraftItem(std::string itemname, const CraftItemDefinition &def)
 	{
 		infostream<<"registerCraftItem: registering CraftItem \""<<itemname<<"\""<<std::endl;
-- 
cgit v1.2.3