Merge branch 'coloritems'

1 files changed, 8 insertions, 3 deletions

diff --git a/src/item.h b/src/item.h
index bc21a437a..ae2cc9dfb 100644
--- a/src/item.h
+++ b/src/item.h
@@ -39,7 +39,8 @@ class Item
          * Constructor.
          */
         Item(int id = -1, int quantity = 0, int refine = 0,
-             bool equipment = false, bool equipped = false);
+             unsigned char color = 1, bool equipment = false,
+             bool equipped = false);
 
         /**
          * Destructor.
@@ -49,7 +50,7 @@ class Item
         /**
          * Sets the item id, identifying the item type.
          */
-        void setId(int id);
+        void setId(int id, unsigned char color);
 
         /**
          * Returns the item id.
@@ -153,10 +154,13 @@ class Item
         const ItemInfo &getInfo() const
         { return ItemDB::get(mId); }
 
-        static Image *getImage(int id);
+        static Image *getImage(int id, unsigned char color);
 
         bool isHaveTag(int tagId);
 
+        unsigned char getColor()
+        { return mColor; }
+
     protected:
         int mId;              /**< Item type id. */
         Image *mImage;        /**< Item image. */
@@ -167,6 +171,7 @@ class Item
         bool mInEquipment;    /**< Item is in equipment */
         int mRefine;          /**< Item refine level. */
         int mInvIndex;        /**< Inventory index. */
+        unsigned char mColor;
         std::map <int, int> mTags;
 };