diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-22 22:56:46 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-10-22 22:56:46 +0000 |
| commit | c9f618b5c50f759cf172d8e37063ef56e05812cf (patch) | |
| tree | ec9730e9c09025873b09e0582349d0c2816d01f4 /src/resources/itemdb.cpp | |
| parent | aa870fe2d34c1cc93a4cc2b6c9a09ed136176b0d (diff) | |
| download | mana-c9f618b5c50f759cf172d8e37063ef56e05812cf.tar.gz mana-c9f618b5c50f759cf172d8e37063ef56e05812cf.tar.bz2 mana-c9f618b5c50f759cf172d8e37063ef56e05812cf.tar.xz mana-c9f618b5c50f759cf172d8e37063ef56e05812cf.zip | |
Merged changesets 3631, 3645 and 3648 from trunk to 0.0 branch.
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 18952ae9..636763fc 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -101,7 +101,6 @@ void ItemDB::load() int type = XML::getProperty(node, "type", 0); int weight = XML::getProperty(node, "weight", 0); int view = XML::getProperty(node, "view", 0); - int slot = XML::getProperty(node, "slot", 0); std::string name = XML::getProperty(node, "name", ""); std::string image = XML::getProperty(node, "image", ""); @@ -119,7 +118,6 @@ void ItemDB::load() itemInfo->setType(type); itemInfo->setView(view); itemInfo->setWeight(weight); - itemInfo->setSlot(slot); itemInfo->setAttackType(attackType); for_each_xml_child_node(itemChild, node) |