Merge branch 'coloritems'

1 files changed, 15 insertions, 1 deletions

diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5ea537fae..297c1b036 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -25,6 +25,7 @@
 
 #include "being.h"
 
+#include "resources/colordb.h"
 #include "resources/spritedef.h"
 
 #include <map>
@@ -111,7 +112,9 @@ class ItemInfo
             mDrawPriority(0),
             mIsRemoveSprites(false),
             mAttackAction(SpriteAction::INVALID),
-            mAttackRange(0)
+            mAttackRange(0),
+            mColors(0),
+            mColorList("")
         {
         }
 
@@ -231,6 +234,15 @@ class ItemInfo
         std::map<int, std::map<int, int> > getSpriteToItemReplaceMap() const
         { return mSpriteToItemReplaceMap; }
 
+        std::string getDyeString(int color) const;
+
+        std::string getDyeColorsString(int color) const;
+
+        void setColorsList(std::string name);
+
+        bool isHaveColors()
+        { return !mColorList.empty(); }
+
     protected:
         SpriteDisplay mDisplay;     /**< Display info (like icon) */
         std::string mName;
@@ -265,6 +277,8 @@ class ItemInfo
         /** Stores the names of sounds to be played at certain event. */
         std::map < EquipmentSoundEvent, std::vector<std::string> > mSounds;
         std::map <int, int> mTags;
+        std::map <int, ColorDB::ItemColor> *mColors;
+        std::string mColorList;
 };
 
 #endif