From 6145a135bd71425c69d31e6c65112238e08349a5 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 4 Dec 2011 02:12:45 +0200
Subject: Make ToolItem and MaterialItem to convert names by aliases at
 creation time too (necessary for eg. crafting)

---
 src/tooldef.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/tooldef.cpp')

diff --git a/src/tooldef.cpp b/src/tooldef.cpp
index 3b7863ba1..7d7eceab0 100644
--- a/src/tooldef.cpp
+++ b/src/tooldef.cpp
@@ -96,12 +96,7 @@ public:
 	virtual const ToolDefinition* getToolDefinition(const std::string &toolname_) const
 	{
 		// Convert name according to possible alias
-		std::string toolname = toolname_;
-		std::map<std::string, std::string>::const_iterator i;
-		i = m_aliases.find(toolname);
-		if(i != m_aliases.end()){
-			toolname = i->second;
-		}
+		std::string toolname = getAlias(toolname_);
 		// Get the definition
 		core::map<std::string, ToolDefinition*>::Node *n;
 		n = m_tool_definitions.find(toolname);
@@ -130,6 +125,15 @@ public:
 		}
 		return def->properties;
 	}
+	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;
+	}
+	// IWritableToolDefManager
 	virtual bool registerTool(std::string toolname, const ToolDefinition &def)
 	{
 		infostream<<"registerTool: registering tool \""<<toolname<<"\""<<std::endl;
-- 
cgit v1.2.3