diff options
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/commands.cpp | 14 | ||||
| -rw-r--r-- | src/actions/statusbar.cpp | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index f22d7bc93..0107770fe 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -114,7 +114,7 @@ static void reportRelation(const InputEvent &event, { if (event.tab != nullptr) { - if (player_relations.getRelation(event.args) == rel) + if (playerRelations.getRelation(event.args) == rel) { // TRANSLATORS: unignore command event.tab->chatLog(str1, ChatMsgType::BY_SERVER); @@ -135,7 +135,7 @@ static void changeRelation(const InputEvent &event, if (args.empty()) return; - if (player_relations.getRelation(args) == relation) + if (playerRelations.getRelation(args) == relation) { if (event.tab != nullptr) { @@ -147,7 +147,7 @@ static void changeRelation(const InputEvent &event, } else { - player_relations.setRelation(args, relation); + playerRelations.setRelation(args, relation); } reportRelation(event, @@ -180,10 +180,10 @@ impHandler(chatUnignore) if (args.empty()) return false; - const RelationT rel = player_relations.getRelation(args); + const RelationT rel = playerRelations.getRelation(args); if (rel != Relation::NEUTRAL && rel != Relation::FRIEND) { - player_relations.setRelation(args, Relation::NEUTRAL); + playerRelations.setRelation(args, Relation::NEUTRAL); } else { @@ -211,7 +211,7 @@ impHandler(chatErase) if (args.empty()) return false; - if (player_relations.getRelation(args) == Relation::ERASED) + if (playerRelations.getRelation(args) == Relation::ERASED) { if (event.tab != nullptr) { @@ -223,7 +223,7 @@ impHandler(chatErase) } else { - player_relations.setRelation(args, Relation::ERASED); + playerRelations.setRelation(args, Relation::ERASED); } reportRelation(event, diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp index 5832d49c0..1555c7233 100644 --- a/src/actions/statusbar.cpp +++ b/src/actions/statusbar.cpp @@ -168,7 +168,7 @@ impHandler0(changeMapMode) impHandler0(changeTrade) { - unsigned int deflt = player_relations.getDefault(); + unsigned int deflt = playerRelations.getDefault(); if ((deflt & PlayerRelation::TRADE) != 0u) { if (localChatTab != nullptr) @@ -190,7 +190,7 @@ impHandler0(changeTrade) deflt |= PlayerRelation::TRADE; } - player_relations.setDefault(deflt); + playerRelations.setDefault(deflt); return true; } |