From 2f768a34f72560ee8b2934228f548a4909533887 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 11 Jun 2017 01:00:01 +0300 Subject: Rename player_relations into playerRelations. --- src/gui/popups/beingpopup.cpp | 2 +- src/gui/popups/popupmenu.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/popups') diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 1834fcbe9..4cafcca27 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -103,7 +103,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) mBeingName->setCaption(b->getName() + b->getGenderSignWithSpace()); if (gui != nullptr) { - if (player_relations.isGoodName(b)) + if (playerRelations.isGoodName(b)) mBeingName->setFont(boldFont); else mBeingName->setFont(gui->getSecureFont()); diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 0dbcaac2f..a01ab6bf8 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -2400,7 +2400,7 @@ void PopupMenu::addNormalRelations() void PopupMenu::addPlayerRelation(const std::string &name) { - switch (player_relations.getRelation(name)) + switch (playerRelations.getRelation(name)) { case Relation::NEUTRAL: // TRANSLATORS: popup menu item @@ -2501,7 +2501,7 @@ void PopupMenu::addFollow() void PopupMenu::addBuySell(const Being *const being) { - if ((player_relations.getDefault() & PlayerRelation::TRADE) != 0u) + if ((playerRelations.getDefault() & PlayerRelation::TRADE) != 0u) { mBrowserBox->addRow("##3---"); const bool haveVending = @@ -2535,7 +2535,7 @@ void PopupMenu::addBuySell(const Being *const being) void PopupMenu::addBuySellDefault() { - if ((player_relations.getDefault() & PlayerRelation::TRADE) != 0u) + if ((playerRelations.getDefault() & PlayerRelation::TRADE) != 0u) { mBrowserBox->addRow("##3---"); // TRANSLATORS: popup menu item -- cgit v1.2.3-70-g09d2