diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-30 17:45:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-30 17:45:27 +0300 |
| commit | aadf40739c45c3396ace5766dd9c60db0c3b1ccc (patch) | |
| tree | a6d2ca5fb86849ae18586b728bfcd9e716f5635f /src/gui/windows | |
| parent | 2a33b736dc93251bf7a72364c5f818142362a3ce (diff) | |
| download | manaverse-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.gz manaverse-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.bz2 manaverse-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.xz manaverse-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.zip | |
Move relation enum into separate file.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.cpp | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index f79f8b45d..747ba498e 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -605,10 +605,10 @@ void ChatWindow::ignoreAllWhispers() if (tab) { if (player_relations.getRelation(tab->getNick()) - != PlayerRelation::IGNORED) + != Relation::IGNORED) { player_relations.setRelation(tab->getNick(), - PlayerRelation::IGNORED); + Relation::IGNORED); } tab->handleCommand("close", ""); } diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index d0b896041..174b242dd 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -282,13 +282,13 @@ void WhoIsOnline::handlerPlayerRelation(const std::string &nick, { switch (player_relations.getRelation(nick)) { - case PlayerRelation::NEUTRAL: + case Relation::NEUTRAL: default: setNeutralColor(player); mNeutral.push_back(player); break; - case PlayerRelation::FRIEND: + case Relation::FRIEND: player->setText("2"); if (mGroupFriends) mFriends.push_back(player); @@ -296,19 +296,19 @@ void WhoIsOnline::handlerPlayerRelation(const std::string &nick, mNeutral.push_back(player); break; - case PlayerRelation::DISREGARDED: - case PlayerRelation::BLACKLISTED: + case Relation::DISREGARDED: + case Relation::BLACKLISTED: player->setText("8"); mDisregard.push_back(player); break; - case PlayerRelation::ENEMY2: + case Relation::ENEMY2: player->setText("1"); mEnemy.push_back(player); break; - case PlayerRelation::IGNORED: - case PlayerRelation::ERASED: + case Relation::IGNORED: + case Relation::ERASED: // Ignore the ignored. break; } |