nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 02:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Chat): PSendSysMessage to fmt (#19449)

Browse Source 
* refactor(Core/Chat): PSendSysMessage to `fmt`
This commit is contained in:
Kitzunu
2024-07-23 23:48:46 +02:00
committed by GitHub
parent e79c89aeb1
commit 3fbded8f6b
52 changed files with 801 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/server/scripts/Commands/cs_character.cpp
View File

@@ -188,12 +188,12 @@ public:
if (!handler->GetSession())
handler->PSendSysMessage(LANG_CHARACTER_DELETED_LIST_LINE_CONSOLE,
itr->lowGuid, itr->name.c_str(), itr->accountName.empty() ? "<Not existing>" : itr->accountName.c_str(),
itr->accountId, dateStr.c_str());
itr->lowGuid, itr->name, itr->accountName.empty() ? "<Not existing>" : itr->accountName,
itr->accountId, dateStr);
else
handler->PSendSysMessage(LANG_CHARACTER_DELETED_LIST_LINE_CHAT,
itr->lowGuid, itr->name.c_str(), itr->accountName.empty() ? "<Not existing>" : itr->accountName.c_str(),
itr->accountId, dateStr.c_str());
itr->lowGuid, itr->name, itr->accountName.empty() ? "<Not existing>" : itr->accountName,
itr->accountId, dateStr);
}
if (!handler->GetSession())
@@ -214,7 +214,7 @@ public:
{
if (delInfo.accountName.empty()) // account does not exist
{
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_ACCOUNT, delInfo.name.c_str(), delInfo.lowGuid, delInfo.accountId);
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_ACCOUNT, delInfo.name, delInfo.lowGuid, delInfo.accountId);
return;
}
@@ -222,13 +222,13 @@ public:
uint32 charcount = AccountMgr::GetCharactersCount(delInfo.accountId);
if (charcount >= 10)
{
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_FULL, delInfo.name.c_str(), delInfo.lowGuid, delInfo.accountId);
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_FULL, delInfo.name, delInfo.lowGuid, delInfo.accountId);
return;
}
if (sCharacterCache->GetCharacterGuidByName(delInfo.name))
{
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_NAME, delInfo.name.c_str(), delInfo.lowGuid, delInfo.accountId);
handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_NAME, delInfo.name, delInfo.lowGuid, delInfo.accountId);
return;
}
@@ -257,11 +257,11 @@ public:
if (handler->needReportToTarget(player))
{
if (oldLevel == newLevel)
ChatHandler(player->GetSession()).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET, handler->GetNameLink().c_str());
ChatHandler(player->GetSession()).PSendSysMessage(LANG_YOURS_LEVEL_PROGRESS_RESET, handler->GetNameLink());
else if (oldLevel < newLevel)
ChatHandler(player->GetSession()).PSendSysMessage(LANG_YOURS_LEVEL_UP, handler->GetNameLink().c_str(), newLevel);
ChatHandler(player->GetSession()).PSendSysMessage(LANG_YOURS_LEVEL_UP, handler->GetNameLink(), newLevel);
else // if (oldlevel > newlevel)
ChatHandler(player->GetSession()).PSendSysMessage(LANG_YOURS_LEVEL_DOWN, handler->GetNameLink().c_str(), newLevel);
ChatHandler(player->GetSession()).PSendSysMessage(LANG_YOURS_LEVEL_DOWN, handler->GetNameLink(), newLevel);
}
}
else
@@ -314,7 +314,7 @@ public:
// send title in "id (idx:idx) - [namedlink locale]" format
if (handler->GetSession())
handler->PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleName.c_str(), localeNames[loc], knownStr, activeStr);
handler->PSendSysMessage(LANG_TITLE_LIST_CHAT, id, titleInfo->bit_index, id, titleName, localeNames[loc], knownStr, activeStr);
else
handler->PSendSysMessage(LANG_TITLE_LIST_CONSOLE, id, titleInfo->bit_index, name, localeNames[loc], knownStr, activeStr);
}
@@ -371,7 +371,7 @@ public:
PreparedQueryResult result = CharacterDatabase.Query(stmt);
if (result)
{
handler->SendErrorMessage(LANG_RENAME_PLAYER_ALREADY_EXISTS, newName.c_str());
handler->SendErrorMessage(LANG_RENAME_PLAYER_ALREADY_EXISTS, newName);
return false;
}
@@ -399,13 +399,13 @@ public:
sCharacterCache->UpdateCharacterData(player->GetGUID(), newName);
handler->PSendSysMessage(LANG_RENAME_PLAYER_WITH_NEW_NAME, player->GetName().c_str(), newName.c_str());
handler->PSendSysMessage(LANG_RENAME_PLAYER_WITH_NEW_NAME, player->GetName(), newName);
}
else
{
if (Player* target = player->GetConnectedPlayer())
{
handler->PSendSysMessage(LANG_RENAME_PLAYER, handler->GetNameLink(target).c_str());
handler->PSendSysMessage(LANG_RENAME_PLAYER, handler->GetNameLink(target));
target->SetAtLoginFlag(AT_LOGIN_RENAME);
}
else
@@ -414,7 +414,7 @@ public:
if (handler->HasLowerSecurity(nullptr, player->GetGUID()))
return false;
handler->PSendSysMessage(LANG_RENAME_PLAYER_GUID, handler->playerLink(*player).c_str(), player->GetGUID().GetCounter());
handler->PSendSysMessage(LANG_RENAME_PLAYER_GUID, handler->playerLink(*player), player->GetGUID().ToString());
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG);
stmt->SetData(0, uint16(AT_LOGIN_RENAME));
@@ -450,7 +450,7 @@ public:
HandleCharacterLevel(player->GetConnectedPlayer(), player->GetGUID(), oldlevel, newlevel, handler);
if (!handler->GetSession() || (handler->GetSession()->GetPlayer() != player->GetConnectedPlayer())) // including chr == NULL
handler->PSendSysMessage(LANG_YOU_CHANGE_LVL, handler->playerLink(*player).c_str(), newlevel);
handler->PSendSysMessage(LANG_YOU_CHANGE_LVL, handler->playerLink(*player), newlevel);
return true;
}
@@ -465,12 +465,12 @@ public:
if (Player* target = player->GetConnectedPlayer())
{
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER, handler->GetNameLink(target).c_str());
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER, handler->GetNameLink(target));
target->SetAtLoginFlag(AT_LOGIN_CUSTOMIZE);
}
else
{
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, handler->playerLink(*player).c_str(), player->GetGUID().GetCounter());
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, handler->playerLink(*player), player->GetGUID().ToString());
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG);
stmt->SetData(0, static_cast<uint16>(AT_LOGIN_CUSTOMIZE));
stmt->SetData(1, player->GetGUID().GetCounter());
@@ -489,12 +489,12 @@ public:
if (Player* target = player->GetConnectedPlayer())
{
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER, handler->GetNameLink(target).c_str());
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER, handler->GetNameLink(target));
target->SetAtLoginFlag(AT_LOGIN_CHANGE_FACTION);
}
else
{
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, handler->playerLink(*player).c_str(), player->GetGUID().GetCounter());
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, handler->playerLink(*player), player->GetGUID().ToString());
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG);
stmt->SetData(0, uint16(AT_LOGIN_CHANGE_FACTION));
stmt->SetData(1, player->GetGUID().GetCounter());
@@ -513,12 +513,12 @@ public:
if (Player* target = player->GetConnectedPlayer())
{
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER, handler->GetNameLink(target).c_str());
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER, handler->GetNameLink(target));
target->SetAtLoginFlag(AT_LOGIN_CHANGE_RACE);
}
else
{
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, handler->playerLink(*player).c_str(), player->GetGUID().GetCounter());
handler->PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, handler->playerLink(*player), player->GetGUID().ToString());
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG);
stmt->SetData(0, uint16(AT_LOGIN_CHANGE_RACE));
stmt->SetData(1, player->GetGUID().GetCounter());
@@ -746,7 +746,7 @@ public:
AccountMgr::GetName(accountId, accountName);
Player::DeleteFromDB(player.GetGUID().GetCounter(), accountId, true, true);
handler->PSendSysMessage(LANG_CHARACTER_DELETED, player.GetName().c_str(), player.GetGUID().GetCounter(), accountName.c_str(), accountId);
handler->PSendSysMessage(LANG_CHARACTER_DELETED, player.GetName(), player.GetGUID().ToString(), accountName, accountId);
return true;
}
@@ -771,7 +771,7 @@ public:
HandleCharacterLevel(player->GetConnectedPlayer(), player->GetGUID(), oldlevel, newlevel, handler);
if (!handler->GetSession() || (handler->GetSession()->GetPlayer() != player->GetConnectedPlayer())) // including chr == NULL
handler->PSendSysMessage(LANG_YOU_CHANGE_LVL, handler->playerLink(*player).c_str(), newlevel);
handler->PSendSysMessage(LANG_YOU_CHANGE_LVL, handler->playerLink(*player), newlevel);
return true;
}
@@ -819,13 +819,13 @@ public:
handler->PSendSysMessage(LANG_COMMAND_IMPORT_SUCCESS);
break;
case DUMP_FILE_OPEN_ERROR:
handler->SendErrorMessage(LANG_FILE_OPEN_FAIL, fileName.c_str());
handler->SendErrorMessage(LANG_FILE_OPEN_FAIL, fileName);
return false;
case DUMP_FILE_BROKEN:
handler->SendErrorMessage(LANG_DUMP_BROKEN, fileName.c_str());
handler->SendErrorMessage(LANG_DUMP_BROKEN, fileName);
return false;
case DUMP_TOO_MANY_CHARS:
handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName().c_str(), account.GetID());
handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName(), account.GetID());
return false;
default:
handler->SendErrorMessage(LANG_COMMAND_IMPORT_FAILED);
@@ -860,7 +860,7 @@ public:
case DUMP_SUCCESS:
break;
case DUMP_TOO_MANY_CHARS:
handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName().c_str(), account.GetID());
handler->SendErrorMessage(LANG_ACCOUNT_CHARACTER_LIST_FULL, account.GetName(), account.GetID());
return false;
case DUMP_FILE_OPEN_ERROR: // this error code should not happen
case DUMP_FILE_BROKEN: // this error code should not happen
@@ -884,7 +884,7 @@ public:
handler->PSendSysMessage(LANG_COMMAND_EXPORT_SUCCESS);
break;
case DUMP_FILE_OPEN_ERROR:
handler->SendErrorMessage(LANG_FILE_OPEN_FAIL, fileName.c_str());
handler->SendErrorMessage(LANG_FILE_OPEN_FAIL, fileName);
return false;
case DUMP_CHARACTER_DELETED:
handler->SendErrorMessage(LANG_COMMAND_EXPORT_DELETED_CHAR);
@@ -942,7 +942,7 @@ public:
std::ostringstream ItemString;
ItemString << std::hex << ItemQualityColors[item->GetTemplate()->Quality];
handler->PSendSysMessage("%u - |c%s|Hitem:%u:0:0:0:0:0:0:0:0:0|h[%s]|h|r - %u", Counter, ItemString.str().c_str(), item->GetEntry(), item->GetTemplate()->Name1.c_str(), item->GetCount());
handler->PSendSysMessage("{} - |c{}|Hitem:{}:0:0:0:0:0:0:0:0:0|h[{}]|h|r - {}", Counter, ItemString.str(), item->GetEntry(), item->GetTemplate()->Name1, item->GetCount());
}
}
}
@@ -958,7 +958,7 @@ public:
std::ostringstream ItemString;
ItemString << std::hex << ItemQualityColors[item->GetTemplate()->Quality];
handler->PSendSysMessage("%u - |c%s|Hitem:%u:0:0:0:0:0:0:0:0:0|h[%s]|h|r - %u", Counter, ItemString.str().c_str(), item->GetEntry(), item->GetTemplate()->Name1.c_str(), item->GetCount());
handler->PSendSysMessage("{} - |c{}|Hitem:{}:0:0:0:0:0:0:0:0:0|h[{}]|h|r - {}", Counter, ItemString.str(), item->GetEntry(), item->GetTemplate()->Name1, item->GetCount());
}
}
}
@@ -998,43 +998,43 @@ public:
switch (SkillID)
{
case SKILL_ALCHEMY:
handler->PSendSysMessage("%u - Alchemy - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Alchemy - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_BLACKSMITHING:
handler->PSendSysMessage("%u - Blacksmithing - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Blacksmithing - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_ENCHANTING:
handler->PSendSysMessage("%u - Enchanting - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Enchanting - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_ENGINEERING:
handler->PSendSysMessage("%u - Engineering - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Engineering - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_INSCRIPTION:
handler->PSendSysMessage("%u - Inscription - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Inscription - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_JEWELCRAFTING:
handler->PSendSysMessage("%u - Jewelcrafting - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Jewelcrafting - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_LEATHERWORKING:
handler->PSendSysMessage("%u - Leatherworking - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Leatherworking - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_TAILORING:
handler->PSendSysMessage("%u - Tailoring - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Tailoring - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_SKINNING:
handler->PSendSysMessage("%u - Skinning - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Skinning - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_HERBALISM:
handler->PSendSysMessage("%u - Herbalism - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Herbalism - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_MINING:
handler->PSendSysMessage("%u - Mining - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Mining - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_COOKING:
handler->PSendSysMessage("%u - Cooking - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - Cooking - {}", Counter, player->GetSkillValue(SkillID));
break;
case SKILL_FIRST_AID:
handler->PSendSysMessage("%u - First Aid - %u", Counter, player->GetSkillValue(SkillID));
handler->PSendSysMessage("{} - First Aid - {}", Counter, player->GetSkillValue(SkillID));
break;
default:
break;
@@ -1071,7 +1071,7 @@ public:
{
std::string accName;
AccountMgr::GetName(cache->AccountId, accName);
handler->PSendSysMessage(LANG_CMD_CHAR_CHANGE_ACC_SUCCESS, player->GetName(), player->GetGUID().GetCounter(), accName, cache->AccountId, accountName, accountId);
handler->PSendSysMessage(LANG_CMD_CHAR_CHANGE_ACC_SUCCESS, player->GetName(), player->GetGUID().ToString(), accName, cache->AccountId, accountName, accountId);
}
if (player->IsConnected())