diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/ea/beingrecv.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/traderecv.cpp | 4 | ||||
| -rw-r--r-- | src/net/eathena/chatrecv.cpp | 6 | ||||
| -rw-r--r-- | src/net/tmwa/chatrecv.cpp | 8 | ||||
| -rw-r--r-- | src/net/tmwa/traderecv.cpp | 2 |
5 files changed, 11 insertions, 11 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)) diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp index 36bcc5bfe..9e766be83 100644 --- a/src/net/eathena/chatrecv.cpp +++ b/src/net/eathena/chatrecv.cpp @@ -486,7 +486,7 @@ void ChatRecv::processWhisperContinue(const std::string &nick, if (nick != "Server") { - if (player_relations.hasPermission(nick, PlayerRelation::WHISPER)) + if (playerRelations.hasPermission(nick, PlayerRelation::WHISPER)) chatWindow->addWhisper(nick, chatMsg); } else if (localChatTab != nullptr) @@ -537,7 +537,7 @@ void ChatRecv::processBeingChat(Net::MessageIn &msg) // We use getIgnorePlayer instead of ignoringPlayer here // because ignorePlayer' side effects are triggered // right below for Being::IGNORE_SPEECH_FLOAT. - if ((player_relations.checkPermissionSilently(sender_name, + if ((playerRelations.checkPermissionSilently(sender_name, PlayerRelation::SPEECH_LOG) != 0u) && (chatWindow != nullptr)) { allow = chatWindow->resortChatLog( @@ -550,7 +550,7 @@ void ChatRecv::processBeingChat(Net::MessageIn &msg) if (allow && being != nullptr && - player_relations.hasPermission(sender_name, + playerRelations.hasPermission(sender_name, PlayerRelation::SPEECH_FLOAT)) { being->setSpeech(chatMsg, GENERAL_CHANNEL); diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp index 0d90a6f99..62150a2ad 100644 --- a/src/net/tmwa/chatrecv.cpp +++ b/src/net/tmwa/chatrecv.cpp @@ -184,11 +184,11 @@ void ChatRecv::processWhisperContinue(const std::string &nick, return; } - if (player_relations.hasPermission(nick, PlayerRelation::WHISPER)) + if (playerRelations.hasPermission(nick, PlayerRelation::WHISPER)) { const bool tradeBot = config.getBoolValue("tradebot"); const bool showMsg = !config.getBoolValue("hideShopMessages"); - if (player_relations.hasPermission(nick, PlayerRelation::TRADE)) + if (playerRelations.hasPermission(nick, PlayerRelation::TRADE)) { if (shopWindow != nullptr) { // commands to shop from player @@ -341,7 +341,7 @@ void ChatRecv::processBeingChat(Net::MessageIn &msg) // We use getIgnorePlayer instead of ignoringPlayer here // because ignorePlayer' side effects are triggered // right below for Being::IGNORE_SPEECH_FLOAT. - if ((player_relations.checkPermissionSilently(sender_name, + if ((playerRelations.checkPermissionSilently(sender_name, PlayerRelation::SPEECH_LOG) != 0u) && (chatWindow != nullptr)) { @@ -355,7 +355,7 @@ void ChatRecv::processBeingChat(Net::MessageIn &msg) if (allow && (being != nullptr) && - player_relations.hasPermission(sender_name, + playerRelations.hasPermission(sender_name, PlayerRelation::SPEECH_FLOAT)) { being->setSpeech(chatMsg, GENERAL_CHANNEL); diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp index f846de3c0..d799d9f91 100644 --- a/src/net/tmwa/traderecv.cpp +++ b/src/net/tmwa/traderecv.cpp @@ -157,7 +157,7 @@ void TradeRecv::processTradeItemAddResponse(Net::MessageIn &msg) void TradeRecv::processTradeResponse(Net::MessageIn &msg) { if (tradePartnerName.empty() || - !player_relations.hasPermission(tradePartnerName, + !playerRelations.hasPermission(tradePartnerName, PlayerRelation::TRADE)) { tradeHandler->respond(false); |