diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-11 01:00:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-11 01:00:01 +0300 |
| commit | 2f768a34f72560ee8b2934228f548a4909533887 (patch) | |
| tree | 0849395dea15a851fcec1a6236c29648cb41add7 /src/net/ea | |
| parent | 05edba87ab0dae7ac4480c86655afe59cd1dd3bd (diff) | |
| download | manaplus-2f768a34f72560ee8b2934228f548a4909533887.tar.gz manaplus-2f768a34f72560ee8b2934228f548a4909533887.tar.bz2 manaplus-2f768a34f72560ee8b2934228f548a4909533887.tar.xz manaplus-2f768a34f72560ee8b2934228f548a4909533887.zip | |
Rename player_relations into playerRelations.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/beingrecv.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/traderecv.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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)) |