diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
| commit | 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (patch) | |
| tree | 95684590a32266b28f046475cfa1926c99f67e52 /src/resources/itemdb.cpp | |
| parent | cf36850d2bdda67cb472d938ed58053a92fa6935 (diff) | |
| download | mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.gz mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.bz2 mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.xz mana-client-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.zip | |
Merged revisions 3629-3630 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(but kept looks in Being class, since eAthena works that way)
........
r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line
Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items.
........
r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line
Fixed changelog message.
........
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 636763fc..fb95a521 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -106,7 +106,7 @@ void ItemDB::load() std::string image = XML::getProperty(node, "image", ""); std::string description = XML::getProperty(node, "description", ""); std::string effect = XML::getProperty(node, "effect", ""); - std::string attackType = XML::getProperty(node, "attacktype", ""); + int weaponType = XML::getProperty(node, "weapon_type", 0); if (id) { @@ -118,7 +118,7 @@ void ItemDB::load() itemInfo->setType(type); itemInfo->setView(view); itemInfo->setWeight(weight); - itemInfo->setAttackType(attackType); + itemInfo->setWeaponType(weaponType); for_each_xml_child_node(itemChild, node) { |