diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-20 19:47:54 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-20 19:47:54 +0300 |
commit | 8167471e438210f4a81fca8d2c70f52bb736983f (patch) | |
tree | 015cadacb4033d508dd8c67ffa2b79b46225d46d /src/resources/iteminfo.h | |
parent | 3252fd4454419f7576390dea6157897218a503d6 (diff) | |
download | mv-8167471e438210f4a81fca8d2c70f52bb736983f.tar.gz mv-8167471e438210f4a81fca8d2c70f52bb736983f.tar.bz2 mv-8167471e438210f4a81fca8d2c70f52bb736983f.tar.xz mv-8167471e438210f4a81fca8d2c70f52bb736983f.zip |
Move itemcolordata into separate file.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r-- | src/resources/iteminfo.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 3df93e978..5d06a89e8 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -31,17 +31,13 @@ #include "enums/simpletypes/itemcolor.h" #include "resources/cursors.h" +#include "resources/itemcolordata.h" #include "resources/soundinfo.h" #include "resources/sprite/spritedisplay.h" #include "utils/intmap.h" -namespace ColorDB -{ - class ItemColorData; -} // namespace ColorDB - // sprite, <itemfrom, itemto> typedef std::map<int, IntMap> SpriteToItemMap; typedef SpriteToItemMap::const_iterator SpriteToItemMapCIter; @@ -364,8 +360,8 @@ class ItemInfo final /** Stores the names of sounds to be played at certain event. */ std::map <ItemSoundEvent::Type, SoundInfoVect> mSounds; std::map <int, int> mTags; - const std::map <ItemColor, ColorDB::ItemColorData> *mColorsList; - const std::map <ItemColor, ColorDB::ItemColorData> *mIconColorsList; + const std::map <ItemColor, ItemColorData> *mColorsList; + const std::map <ItemColor, ItemColorData> *mIconColorsList; std::string mColorsListName; std::string mIconColorsListName; ItemColor mCardColor; |