From c9f618b5c50f759cf172d8e37063ef56e05812cf Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 22 Oct 2007 22:56:46 +0000
Subject: Merged changesets 3631, 3645 and 3648 from trunk to 0.0 branch.

---
 src/resources/itemdb.cpp |  2 --
 src/resources/iteminfo.h | 10 +---------
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'src/resources')

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. */
-- 
cgit v1.2.3-70-g09d2