From 2f768a34f72560ee8b2934228f548a4909533887 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 11 Jun 2017 01:00:01 +0300
Subject: Rename player_relations into playerRelations.

---
 src/net/ea/beingrecv.cpp | 2 +-
 src/net/ea/traderecv.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/net/ea')

diff --git a/src/net/ea/beingrecv.cpp b/src/net/ea/beingrecv.cpp
index 2c5eab9e3..b6e848bc5 100644
--- a/src/net/ea/beingrecv.cpp
+++ b/src/net/ea/beingrecv.cpp
@@ -260,7 +260,7 @@ void BeingRecv::processBeingEmotion(Net::MessageIn &msg)
 
     const uint8_t emote = msg.readUInt8("emote");
     if ((emote != 0u) &&
-        player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE))
+        playerRelations.hasPermission(dstBeing, PlayerRelation::EMOTE))
     {
         dstBeing->setEmote(emote, 0);
         localPlayer->imitateEmote(dstBeing, emote);
diff --git a/src/net/ea/traderecv.cpp b/src/net/ea/traderecv.cpp
index 9b5799c69..d47fc256b 100644
--- a/src/net/ea/traderecv.cpp
+++ b/src/net/ea/traderecv.cpp
@@ -83,7 +83,7 @@ void TradeRecv::processTradeResponseContinue(const uint8_t type)
             }
             break;
         case 4:  // Trade cancelled
-            if (player_relations.hasPermission(tradePartnerName,
+            if (playerRelations.hasPermission(tradePartnerName,
                 PlayerRelation::SPEECH_LOG))
             {
                 NotifyManager::notify(NotifyTypes::TRADE_CANCELLED_NAME,
@@ -141,7 +141,7 @@ void TradeRecv::processTradeComplete(Net::MessageIn &msg A_UNUSED)
 
 void TradeRecv::processTradeRequestContinue(const std::string &partner)
 {
-    if (player_relations.hasPermission(partner,
+    if (playerRelations.hasPermission(partner,
         PlayerRelation::TRADE))
     {
         if (PlayerInfo::isTrading() == Trading_true || (confirmDlg != nullptr))
-- 
cgit v1.2.3-70-g09d2