From f885dda3c5b289eff21b3c2a889c69f6d1af7d2c Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 30 Mar 2009 08:34:39 -0600 Subject: Merge weapon types --- src/resources/itemdb.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/resources/itemdb.cpp') 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; -- cgit v1.2.3-70-g09d2