Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Common: Tokenizer -> Trinity::Tokenize (PR: #25327)

Browse Source 
(cherry picked from commit 534a2388b7)
This commit is contained in:
Treeston
2020-08-28 00:11:16 +02:00
committed by Shauren
parent 6e45c371c4
commit 9f97fdd31a
46 changed files with 661 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/Chat/Chat.cpp
View File

@@ -180,7 +180,7 @@ void ChatHandler::SendSysMessage(const char *str, bool escapeCharacters)
// Replace every "|" with "||" in msg
if (escapeCharacters && msg.find('|') != std::string::npos)
{
Tokenizer tokens{msg, '|'};
std::vector<std::string_view> tokens = Trinity::Tokenize(msg, '|', true);
std::ostringstream stream;
for (size_t i = 0; i < tokens.size() - 1; ++i)
stream << tokens[i] << "||";
@@ -190,7 +190,7 @@ void ChatHandler::SendSysMessage(const char *str, bool escapeCharacters)
}
WorldPackets::Chat::Chat packet;
for (const auto& line : Tokenizer{msg, '\n'})
for (std::string_view line : Trinity::Tokenize(str, '\n', true))
{
packet.Initialize(CHAT_MSG_SYSTEM, LANG_UNIVERSAL, nullptr, nullptr, line);
m_session->SendPacket(packet.Write());
@@ -200,7 +200,7 @@ void ChatHandler::SendSysMessage(const char *str, bool escapeCharacters)
void ChatHandler::SendGlobalSysMessage(const char *str)
{
WorldPackets::Chat::Chat packet;
for (const auto& line : Tokenizer{str, '\n'})
for (std::string_view line : Trinity::Tokenize(str, '\n', true))
{
packet.Initialize(CHAT_MSG_SYSTEM, LANG_UNIVERSAL, nullptr, nullptr, line);
sWorld->SendGlobalMessage(packet.Write());
@@ -210,7 +210,7 @@ void ChatHandler::SendGlobalSysMessage(const char *str)
void ChatHandler::SendGlobalGMSysMessage(const char *str)
{
WorldPackets::Chat::Chat packet;
for (const auto& line : Tokenizer{str, '\n'})
for (std::string_view line : Trinity::Tokenize(str, '\n', true))
{
packet.Initialize(CHAT_MSG_SYSTEM, LANG_UNIVERSAL, nullptr, nullptr, line);
sWorld->SendGlobalGMMessage(packet.Write());