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 | |
| parent | aa870fe2d34c1cc93a4cc2b6c9a09ed136176b0d (diff) | |
| download | mana-client-c9f618b5c50f759cf172d8e37063ef56e05812cf.tar.gz mana-client-c9f618b5c50f759cf172d8e37063ef56e05812cf.tar.bz2 mana-client-c9f618b5c50f759cf172d8e37063ef56e05812cf.tar.xz mana-client-c9f618b5c50f759cf172d8e37063ef56e05812cf.zip | |
Merged changesets 3631, 3645 and 3648 from trunk to 0.0 branch.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/itemdb.cpp | 2 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 10 |
2 files changed, 1 insertions, 11 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) diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 4fd1638e..457daf7f 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -54,7 +54,6 @@ class ItemInfo mType(0), mWeight(0), mView(0), - mSlot(0), mAttackType(ACTION_DEFAULT) { } @@ -102,12 +101,6 @@ class ItemInfo void setView(int view) { mView = view; } - void setSlot(char slot) - { mSlot = slot; } - - char getSlot() const - { return mSlot; } - void setSprite(const std::string &animationFile, int gender) { mAnimationFiles[gender] = animationFile; } @@ -134,12 +127,11 @@ class ItemInfo std::string mName; std::string mDescription; /**< Short description. */ std::string mEffect; /**< Description of effects. */ - short mType; /**< Item type (never used). */ + char mType; /**< Item type. */ short mWeight; /**< Weight in grams. */ int mView; /**< Item ID of how this item looks. */ // Equipment related members - char mSlot; /**< Equipment slot. */ SpriteAction mAttackType; /**< Attack type, in case of weapon. */ /** Maps gender to sprite filenames. */ |