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

Revert "[3.3.5] Core/ChatCommands: C++17 cleanup (if constexpr + std::string_view)"

Browse Source 
This reverts commit 11c4a60fbe.
This commit is contained in:
Treeston
2020-08-24 16:38:39 +02:00
parent 11c4a60fbe
commit fd05a35341
13 changed files with 532 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Commands/cs_debug.cpp
View File

@@ -1706,7 +1706,7 @@ public:
return true;
}
static bool HandleDebugOutOfBounds([[maybe_unused]] ChatHandler* handler)
static bool HandleDebugOutOfBounds([[maybe_unused]] ChatHandler* handler, CommandArgs* /*args*/)
{
#ifdef ASAN
uint8 stack_array[10] = {};
@@ -1852,7 +1852,7 @@ public:
handler->PSendSysMessage("Entry: %u Count: %u", p.first, p.second);
}
static bool HandleDebugDummyCommand(ChatHandler* handler)
static bool HandleDebugDummyCommand(ChatHandler* handler, CommandArgs* /*args*/)
{
handler->SendSysMessage("This command does nothing right now. Edit your local core (cs_debug.cpp) to make it do whatever you need for testing.");
return true;

36
src/server/scripts/Commands/cs_message.cpp
View File

@@ -127,60 +127,60 @@ public:
return true;
}
static bool HandleNameAnnounceCommand(ChatHandler* handler, Tail message)
static bool HandleNameAnnounceCommand(ChatHandler* handler, CommandArgs* args)
{
if (message.empty())
if (!*args)
return false;
std::string name("Console");
if (WorldSession* session = handler->GetSession())
name = session->GetPlayer()->GetName();
sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, name.c_str(), message.data());
sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, name.c_str(), args->GetFullArgs());
return true;
}
static bool HandleGMNameAnnounceCommand(ChatHandler* handler, Tail message)
static bool HandleGMNameAnnounceCommand(ChatHandler* handler, CommandArgs* args)
{
if (message.empty())
if (!*args)
return false;
std::string name("Console");
if (WorldSession* session = handler->GetSession())
name = session->GetPlayer()->GetName();
sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, name.c_str(), message.data());
sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, name.c_str(), args->GetFullArgs());
return true;
}
// global announce
static bool HandleAnnounceCommand(ChatHandler* handler, Tail message)
static bool HandleAnnounceCommand(ChatHandler* handler, char const* args)
{
if (message.empty())
if (!*args)
return false;
sWorld->SendServerMessage(SERVER_MSG_STRING, Trinity::StringFormat(handler->GetTrinityString(LANG_SYSTEMMESSAGE), message.data()).c_str());
sWorld->SendServerMessage(SERVER_MSG_STRING, Trinity::StringFormat(handler->GetTrinityString(LANG_SYSTEMMESSAGE), args).c_str());
return true;
}
// announce to logged in GMs
static bool HandleGMAnnounceCommand(ChatHandler* /*handler*/, Tail message)
static bool HandleGMAnnounceCommand(ChatHandler* /*handler*/, CommandArgs* args)
{
if (message.empty())
if (!*args)
return false;
sWorld->SendGMText(LANG_GM_BROADCAST, message.data());
sWorld->SendGMText(LANG_GM_BROADCAST, args->GetFullArgs());
return true;
}
// send on-screen notification to players
static bool HandleNotifyCommand(ChatHandler* handler, Tail message)
static bool HandleNotifyCommand(ChatHandler* handler, CommandArgs* args)
{
if (message.empty())
if (!*args)
return false;
std::string str = handler->GetTrinityString(LANG_GLOBAL_NOTIFY);
str += message;
str += args->GetFullArgs();
WorldPacket data(SMSG_NOTIFICATION, (str.size() + 1));
data << str;
@@ -190,13 +190,13 @@ public:
}
// send on-screen notification to GMs
static bool HandleGMNotifyCommand(ChatHandler* handler, Tail message)
static bool HandleGMNotifyCommand(ChatHandler* handler, CommandArgs* args)
{
if (message.empty())
if (!*args)
return false;
std::string str = handler->GetTrinityString(LANG_GM_NOTIFY);
str += message;
str += args->GetFullArgs();
WorldPacket data(SMSG_NOTIFICATION, (str.size() + 1));
data << str;