diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-06-11 01:00:01 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-06-11 01:00:01 +0300 |
commit | 2f768a34f72560ee8b2934228f548a4909533887 (patch) | |
tree | 0849395dea15a851fcec1a6236c29648cb41add7 /src/being/being.cpp | |
parent | 05edba87ab0dae7ac4480c86655afe59cd1dd3bd (diff) | |
download | ManaVerse-2f768a34f72560ee8b2934228f548a4909533887.tar.gz ManaVerse-2f768a34f72560ee8b2934228f548a4909533887.tar.bz2 ManaVerse-2f768a34f72560ee8b2934228f548a4909533887.tar.xz ManaVerse-2f768a34f72560ee8b2934228f548a4909533887.zip |
Rename player_relations into playerRelations.
Diffstat (limited to 'src/being/being.cpp')
-rw-r--r-- | src/being/being.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index deac96e2c..97492d431 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2461,7 +2461,7 @@ void Being::showName() restrict2 delete2(mDispName); - if (mHideErased && player_relations.getRelation(mName) == Relation::ERASED) + if (mHideErased && playerRelations.getRelation(mName) == Relation::ERASED) return; std::string displayName(mName); @@ -2488,7 +2488,7 @@ void Being::showName() restrict2 font = boldFont; } else if (mType == ActorType::Player - && !player_relations.isGoodName(this) && (gui != nullptr)) + && !playerRelations.isGoodName(this) && (gui != nullptr)) { font = gui->getSecureFont(); } @@ -2573,7 +2573,7 @@ void Being::updateColors() { mTextColor = &theme->getColor(ThemeColorId::PLAYER, 255); - if (player_relations.getRelation(mName) != Relation::ERASED) + if (playerRelations.getRelation(mName) != Relation::ERASED) mErased = false; else mErased = true; @@ -2597,24 +2597,24 @@ void Being::updateColors() { mNameColor = &userPalette->getColor(UserColorId::GUILD); } - else if (player_relations.getRelation(mName) == Relation::FRIEND) + else if (playerRelations.getRelation(mName) == Relation::FRIEND) { mNameColor = &userPalette->getColor(UserColorId::FRIEND); } - else if (player_relations.getRelation(mName) == + else if (playerRelations.getRelation(mName) == Relation::DISREGARDED - || player_relations.getRelation(mName) == + || playerRelations.getRelation(mName) == Relation::BLACKLISTED) { mNameColor = &userPalette->getColor(UserColorId::DISREGARDED); } - else if (player_relations.getRelation(mName) + else if (playerRelations.getRelation(mName) == Relation::IGNORED || - player_relations.getRelation(mName) == Relation::ENEMY2) + playerRelations.getRelation(mName) == Relation::ENEMY2) { mNameColor = &userPalette->getColor(UserColorId::IGNORED); } - else if (player_relations.getRelation(mName) == Relation::ERASED) + else if (playerRelations.getRelation(mName) == Relation::ERASED) { mNameColor = &userPalette->getColor(UserColorId::ERASED); } |