Fixed interpretation of weapon types in items.xml.

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7bdda19f..98881ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-19  Philipp Sehmisch  <tmw@crushnet.org>
+
+	* src/resources/itemdb.cpp: Fixed interpretation of weapon types in
+	items.xml.
+
 2007-01-10  Philipp Sehmisch  <tmw@crushnet.org>
 
 	* src/resources/itemdb.cpp, src/resources/iteminfo.cpp,
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 6d7f5944..c03e42a2 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -151,7 +151,7 @@ void ItemDB::load()
         std::string name = XML::getProperty(node, "name", "");
         std::string image = XML::getProperty(node, "image", "");
         std::string description = XML::getProperty(node, "description", "");
-        int weaponType = itemTypeFromString(XML::getProperty(node, "weapon_type", ""));
+        int weaponType = weaponTypeFromString(XML::getProperty(node, "weapon-type", ""));
 
         ItemInfo *itemInfo = new ItemInfo;
         itemInfo->setImageName(image);