From 44e36d9aaddb93b0ec0e38561c745a1182536752 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 4 Dec 2011 00:44:29 +0200
Subject: [PATCH] Fix craftitem aliases
---
src/craftitemdef.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/craftitemdef.cpp b/src/craftitemdef.cpp
index 622c5c65f..8d4cbea3c 100644
--- a/src/craftitemdef.cpp
+++ b/src/craftitemdef.cpp
@@ -85,8 +85,16 @@ class CCraftItemDefManager: public IWritableCraftItemDefManager
{
clear();
}
- virtual const CraftItemDefinition* getCraftItemDefinition(const std::string &itemname) const
+ 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;
+ }
+ // Get the definition
core::map<std::string, CraftItemDefinition*>::Node *n;
n = m_item_definitions.find(itemname);
if(n == NULL)
--
GitLab