summaryrefslogtreecommitdiff
path: root/src/itemdef.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/itemdef.cpp')
-rw-r--r--src/itemdef.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index a646134af..934150aa1 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -290,8 +290,11 @@ public:
// Ensure that the "" item (the hand) always has ToolCapabilities
if(def.name == "")
assert(def.tool_capabilities != NULL);
-
- m_item_definitions[def.name] = new ItemDefinition(def);
+
+ if(m_item_definitions.count(def.name) == 0)
+ m_item_definitions[def.name] = new ItemDefinition(def);
+ else
+ *(m_item_definitions[def.name]) = def;
// Remove conflicting alias if it exists
bool alias_removed = (m_aliases.erase(def.name) != 0);