diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-12-11 19:10:19 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-12-11 19:10:19 +0300 |
commit | ee1fc0b63cb7f27df85c43474497b805df6e31f5 (patch) | |
tree | d233f17e1bfd751b6939646a24f1253ae8d14796 /src/net | |
parent | a80f4ac5c1c3ef4d3ac5f026591b16074d0bf451 (diff) | |
download | manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.tar.gz manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.tar.bz2 manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.tar.xz manaplus-ee1fc0b63cb7f27df85c43474497b805df6e31f5.zip |
Remove default parameters from ChatTab::chatLog.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/eathena/chatrecv.cpp | 15 | ||||
-rw-r--r-- | src/net/eathena/guildrecv.cpp | 63 | ||||
-rw-r--r-- | src/net/tmwa/chatrecv.cpp | 15 | ||||
-rw-r--r-- | src/net/tmwa/guildmanager.cpp | 10 |
4 files changed, 78 insertions, 25 deletions
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp index 97f0de803..2748d76d7 100644 --- a/src/net/eathena/chatrecv.cpp +++ b/src/net/eathena/chatrecv.cpp @@ -498,7 +498,10 @@ void ChatRecv::processWhisperContinue(const std::string &nick, } else if (localChatTab != nullptr) { - localChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER); + localChatTab->chatLog(chatMsg, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } BLOCK_END("ChatRecv::processWhisper") } @@ -745,7 +748,10 @@ void ChatRecv::processChatTalkieBox(Net::MessageIn &msg) { msg.readBeingId("being id"); const std::string message = msg.readString(80, "message"); - localChatTab->chatLog(message, ChatMsgType::BY_SERVER); + localChatTab->chatLog(message, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } void ChatRecv::processBattleChatMessage(Net::MessageIn &msg) @@ -762,7 +768,10 @@ void ChatRecv::processScriptMessage(Net::MessageIn &msg) const int sz = msg.readInt16("len") - 8; msg.readBeingId("being id"); const std::string message = msg.readString(sz, "message"); - localChatTab->chatLog(message, ChatMsgType::BY_SERVER); + localChatTab->chatLog(message, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } } // namespace EAthena diff --git a/src/net/eathena/guildrecv.cpp b/src/net/eathena/guildrecv.cpp index fd7570896..c0be1be01 100644 --- a/src/net/eathena/guildrecv.cpp +++ b/src/net/eathena/guildrecv.cpp @@ -127,34 +127,54 @@ void GuildRecv::processGuildBasicInfo(Net::MessageIn &msg) showBasicInfo = false; // TRANSLATORS: guild info message guildTab->chatLog(strprintf(_("Guild name: %s"), - name.c_str()), ChatMsgType::BY_SERVER); + name.c_str()), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); if (!master.empty()) { // TRANSLATORS: guild info message guildTab->chatLog(strprintf(_("Guild master: %s"), - master.c_str()), ChatMsgType::BY_SERVER); + master.c_str()), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } // TRANSLATORS: guild info message guildTab->chatLog(strprintf(_("Guild level: %d"), level), - ChatMsgType::BY_SERVER); + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); // TRANSLATORS: guild info message - guildTab->chatLog(strprintf(_("Online members: %d"), - members), ChatMsgType::BY_SERVER); + guildTab->chatLog(strprintf(_("Online members: %d"), members), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); // TRANSLATORS: guild info message - guildTab->chatLog(strprintf(_("Max members: %d"), - maxMembers), ChatMsgType::BY_SERVER); + guildTab->chatLog(strprintf(_("Max members: %d"), maxMembers), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); // TRANSLATORS: guild info message - guildTab->chatLog(strprintf(_("Average level: %d"), - avgLevel), ChatMsgType::BY_SERVER); + guildTab->chatLog(strprintf(_("Average level: %d"), avgLevel), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); // TRANSLATORS: guild info message guildTab->chatLog(strprintf(_("Guild exp: %d"), exp), - ChatMsgType::BY_SERVER); + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); // TRANSLATORS: guild info message - guildTab->chatLog(strprintf(_("Guild next exp: %d"), - nextExp), ChatMsgType::BY_SERVER); + guildTab->chatLog(strprintf(_("Guild next exp: %d"), nextExp), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); // TRANSLATORS: guild info message - guildTab->chatLog(strprintf(_("Guild castle: %s"), - castle.c_str()), ChatMsgType::BY_SERVER); + guildTab->chatLog(strprintf(_("Guild castle: %s"), castle.c_str()), + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } Guild *const g = Guild::getGuild(CAST_S16(guildId)); @@ -381,8 +401,14 @@ void GuildRecv::processGuildNotice(Net::MessageIn &msg) { const std::string msg1 = msg.readString(60, "msg1"); const std::string msg2 = msg.readString(120, "msg2"); - guildTab->chatLog(msg1, ChatMsgType::BY_SERVER); - guildTab->chatLog(msg2, ChatMsgType::BY_SERVER); + guildTab->chatLog(msg1, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); + guildTab->chatLog(msg2, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } else { @@ -498,7 +524,10 @@ void GuildRecv::processGuildMessage(Net::MessageIn &msg) } else { - guildTab->chatLog(chatMsg, ChatMsgType::BY_SERVER); + guildTab->chatLog(chatMsg, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } } else diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp index afa501004..a23dc92a4 100644 --- a/src/net/tmwa/chatrecv.cpp +++ b/src/net/tmwa/chatrecv.cpp @@ -272,7 +272,10 @@ void ChatRecv::processWhisperContinue(const std::string &nick, const size_t pos = chatMsg.find(": ", 0); if (pos == std::string::npos) { - gmChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER); + gmChatTab->chatLog(chatMsg, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } else { @@ -282,7 +285,10 @@ void ChatRecv::processWhisperContinue(const std::string &nick, } else { - localChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER); + localChatTab->chatLog(chatMsg, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } } BLOCK_END("ChatRecv::processWhisper") @@ -371,7 +377,10 @@ void ChatRecv::processScriptMessage(Net::MessageIn &msg) const int sz = msg.readInt16("len") - 5; msg.readUInt8("message type"); const std::string message = msg.readString(sz, "message"); - localChatTab->chatLog(message, ChatMsgType::BY_SERVER); + localChatTab->chatLog(message, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } } // namespace TmwAthena diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp index 5484f1b51..df73a6c40 100644 --- a/src/net/tmwa/guildmanager.cpp +++ b/src/net/tmwa/guildmanager.cpp @@ -448,7 +448,10 @@ bool GuildManager::process(std::string msg) const std::string sender_name = msg.substr(0, pos); if (guild->getMember(sender_name) == nullptr) { - mTab->chatLog(msg, ChatMsgType::BY_SERVER); + mTab->chatLog(msg, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); return true; } @@ -461,7 +464,10 @@ bool GuildManager::process(std::string msg) } else { - mTab->chatLog(msg, ChatMsgType::BY_SERVER); + mTab->chatLog(msg, + ChatMsgType::BY_SERVER, + IgnoreRecord_false, + TryRemoveColors_true); } return true; } |