diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/manaserv/chathandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/chathandler.cpp | 12 | ||||
| -rw-r--r-- | src/net/tmwa/tradehandler.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp index 11a1331e..dca556c2 100644 --- a/src/net/manaserv/chathandler.cpp +++ b/src/net/manaserv/chathandler.cpp @@ -173,7 +173,7 @@ void ChatHandler::handleGameChatMessage(MessageIn &msg) event.setInt("beingId", id); event.setInt("permissions", player_relations .checkPermissionSilently(being->getName(), - PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT)); + PlayerPermissions::SPEECH_LOG | PlayerPermissions::SPEECH_FLOAT)); event.trigger(Event::ChatChannel); } diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 159352cc..e2c4f158 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -396,7 +396,7 @@ void BeingHandler::handleMessage(MessageIn &msg) break; } - if (player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE)) + if (player_relations.hasPermission(dstBeing, PlayerPermissions::EMOTE)) { const int fx = EmoteDB::get(msg.readInt8() - 1).effectId; effectManager->trigger(fx, dstBeing); diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 883ae083..4f998922 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -129,7 +129,7 @@ void ChatHandler::handleMessage(MessageIn &msg) chatMsg.find("!sellitem ") == 0) return; - if (player_relations.hasPermission(nick, PlayerRelation::WHISPER)) + if (player_relations.hasPermission(nick, PlayerPermissions::WHISPER)) { Event event(Event::Whisper); event.setString("nick", nick); @@ -176,13 +176,13 @@ void ChatHandler::handleMessage(MessageIn &msg) if (being->getType() == Being::PLAYER) { perms = player_relations.checkPermissionSilently(sender_name, - PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT); + PlayerPermissions::SPEECH_LOG | PlayerPermissions::SPEECH_FLOAT); } else { perms = player_relations.getDefault() - & (PlayerRelation::SPEECH_LOG - | PlayerRelation::SPEECH_FLOAT); + & (PlayerPermissions::SPEECH_LOG + | PlayerPermissions::SPEECH_FLOAT); } // This is a sure sign of some special command of manaplus, @@ -232,8 +232,8 @@ void ChatHandler::handleMessage(MessageIn &msg) event.setString("nick", local_player->getName()); event.setInt("beingId", local_player->getId()); event.setInt("permissions", player_relations.getDefault() - & (PlayerRelation::SPEECH_LOG - | PlayerRelation::SPEECH_FLOAT)); + & (PlayerPermissions::SPEECH_LOG + | PlayerPermissions::SPEECH_FLOAT)); event.trigger(Event::ChatChannel); } else diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index da82d751..60732eef 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -96,7 +96,7 @@ void TradeHandler::handleMessage(MessageIn &msg) std::string tradePartnerNameTemp = msg.readString(24); if (player_relations.hasPermission(tradePartnerName, - PlayerRelation::TRADE)) + PlayerPermissions::TRADE)) { if (mTrading || confirmDlg) { @@ -142,7 +142,7 @@ void TradeHandler::handleMessage(MessageIn &msg) break; case 4: // Trade cancelled if (player_relations.hasPermission(tradePartnerName, - PlayerRelation::SPEECH_LOG)) + PlayerPermissions::SPEECH_LOG)) { serverNotice(strprintf(_("Trade with %s cancelled."), tradePartnerName.c_str())); |