summaryrefslogtreecommitdiff
path: root/src/resources/itemdb.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-03-30 08:34:39 -0600
committerJared Adams <jaxad0127@gmail.com>2009-03-30 08:34:39 -0600
commitf885dda3c5b289eff21b3c2a889c69f6d1af7d2c (patch)
treefcc93a2e3e4f88b13e671cb8af2f9099bfb25d5b /src/resources/itemdb.cpp
parent2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a (diff)
downloadmana-client-f885dda3c5b289eff21b3c2a889c69f6d1af7d2c.tar.gz
mana-client-f885dda3c5b289eff21b3c2a889c69f6d1af7d2c.tar.bz2
mana-client-f885dda3c5b289eff21b3c2a889c69f6d1af7d2c.tar.xz
mana-client-f885dda3c5b289eff21b3c2a889c69f6d1af7d2c.zip
Merge weapon types
Diffstat (limited to 'src/resources/itemdb.cpp')
-rw-r--r--src/resources/itemdb.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index d9994892..cf7b976b 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -135,11 +135,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", "");
-#ifdef TMWSERV_SUPPORT
int weaponType = weaponTypeFromString(XML::getProperty(node, "weapon-type", ""));
-#else
- int weaponType = XML::getProperty(node, "weapon_type", 0);
-#endif
int attackRange = XML::getProperty(node, "attack-range", 0);
ItemInfo *itemInfo = new ItemInfo;