diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-16 21:32:20 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-16 21:32:20 +0300 |
commit | 0d4fa49a591658989edb5b640d996b9dc93775d2 (patch) | |
tree | 852c22715d7146733879aeffd9c3b34dcc04e3f4 /src/resources/iteminfo.h | |
parent | 7bd3762e44b31b432d46f5d32686a812a2b0a92f (diff) | |
download | manaplus-0d4fa49a591658989edb5b640d996b9dc93775d2.tar.gz manaplus-0d4fa49a591658989edb5b640d996b9dc93775d2.tar.bz2 manaplus-0d4fa49a591658989edb5b640d996b9dc93775d2.tar.xz manaplus-0d4fa49a591658989edb5b640d996b9dc93775d2.zip |
Rename colors list variables in iteminfo.
Diffstat (limited to 'src/resources/iteminfo.h')
-rw-r--r-- | src/resources/iteminfo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 976d30c1d..5d7b2f15f 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -244,7 +244,7 @@ class ItemInfo final void setColorsList(const std::string &name); bool isHaveColors() const A_WARN_UNUSED - { return !mColorList.empty(); } + { return !mColorsListName.empty(); } const std::string replaceColors(std::string str, const ItemColor color) @@ -266,7 +266,7 @@ class ItemInfo final { return mProtected; } int getColorsSize() const - { return mColors ? static_cast<int>(mColors->size()) : 0; } + { return mColorsList ? static_cast<int>(mColorsList->size()) : 0; } std::string getColorName(const ItemColor idx) const; @@ -318,8 +318,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> *mColors; - std::string mColorList; + const std::map <ItemColor, ColorDB::ItemColorData> *mColorsList; + std::string mColorsListName; int mHitEffectId; int mCriticalHitEffectId; int mMissEffectId; |