summaryrefslogtreecommitdiff
path: root/src/net/ea/traderecv.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-11 01:00:01 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-11 01:00:01 +0300
commit2f768a34f72560ee8b2934228f548a4909533887 (patch)
tree0849395dea15a851fcec1a6236c29648cb41add7 /src/net/ea/traderecv.cpp
parent05edba87ab0dae7ac4480c86655afe59cd1dd3bd (diff)
downloadmv-2f768a34f72560ee8b2934228f548a4909533887.tar.gz
mv-2f768a34f72560ee8b2934228f548a4909533887.tar.bz2
mv-2f768a34f72560ee8b2934228f548a4909533887.tar.xz
mv-2f768a34f72560ee8b2934228f548a4909533887.zip
Rename player_relations into playerRelations.
Diffstat (limited to 'src/net/ea/traderecv.cpp')
-rw-r--r--src/net/ea/traderecv.cpp4
1 files changed, 2 insertions, 2 deletions
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))