From 0d4fa49a591658989edb5b640d996b9dc93775d2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Aug 2015 21:32:20 +0300 Subject: Rename colors list variables in iteminfo. --- src/resources/iteminfo.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/resources/iteminfo.h') 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(mColors->size()) : 0; } + { return mColorsList ? static_cast(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 mSounds; std::map mTags; - const std::map *mColors; - std::string mColorList; + const std::map *mColorsList; + std::string mColorsListName; int mHitEffectId; int mCriticalHitEffectId; int mMissEffectId; -- cgit v1.2.3-60-g2f50