Skip to content

Commit 67107c6

Browse files
ShaurenShauren
committed
Core/Misc: Minor fixes in preparation to support fmt v10
(cherry picked from commit 39fc9f800098c314c24db1c4609ff13809100dcd)
1 parent 1614308 commit 67107c6

8 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎src/common/Utilities/StringFormat.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace Trinity
4343
}
4444
catch (std::exception const& formatError)
4545
{
46-
return fmt::format("An error occurred formatting string \"{}\" : {}", fmt, formatError.what());
46+
return fmt::format("An error occurred formatting string \"{}\" : {}", FormatStringView(fmt), formatError.what());
4747
}
4848
}
4949

@@ -56,7 +56,7 @@ namespace Trinity
5656
}
5757
catch (std::exception const& formatError)
5858
{
59-
return fmt::format_to(out, "An error occurred formatting string \"{}\" : {}", fmt, formatError.what());
59+
return fmt::format_to(out, "An error occurred formatting string \"{}\" : {}", FormatStringView(fmt), formatError.what());
6060
}
6161
}
6262

@@ -118,7 +118,7 @@ struct fmt::formatter<Optional<T>, Char> : formatter<T, Char>
118118
if (value.has_value())
119119
return formatter<T, Char>::format(*value, ctx);
120120

121-
return formatter<std::string_view, Char>().format("(nullopt)", ctx);
121+
return formatter<string_view, Char>().format("(nullopt)", ctx);
122122
}
123123
};
124124

‎src/server/game/Handlers/GuildHandler.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void WorldSession::HandleGuildDelete(WorldPackets::Guild::GuildDelete& /*packet*
129129

130130
void WorldSession::HandleGuildUpdateMotdText(WorldPackets::Guild::GuildUpdateMotdText& packet)
131131
{
132-
TC_LOG_DEBUG("guild", "CMSG_GUILD_MOTD [{}]: MOTD: {}", GetPlayerInfo(), packet.MotdText);
132+
TC_LOG_DEBUG("guild", "CMSG_GUILD_MOTD [{}]: MOTD: {}", GetPlayerInfo(), std::string_view(packet.MotdText));
133133

134134
if (Guild* guild = GetPlayer()->GetGuild())
135135
guild->HandleSetMOTD(this, packet.MotdText);
@@ -138,7 +138,7 @@ void WorldSession::HandleGuildUpdateMotdText(WorldPackets::Guild::GuildUpdateMot
138138
void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPackets::Guild::GuildSetMemberNote& packet)
139139
{
140140
TC_LOG_DEBUG("guild", "CMSG_GUILD_SET_PUBLIC_NOTE [{}]: Target: {}, Note: {}",
141-
GetPlayerInfo(), packet.NoteeName, packet.Note);
141+
GetPlayerInfo(), packet.NoteeName, std::string_view(packet.Note));
142142

143143
if (normalizePlayerName(packet.NoteeName))
144144
if (Guild* guild = GetPlayer()->GetGuild())
@@ -165,14 +165,14 @@ void WorldSession::HandleGuildSetRankPermissions(WorldPackets::Guild::GuildSetRa
165165
for (uint8 tabId = 0; tabId < GUILD_BANK_MAX_TABS; ++tabId)
166166
rightsAndSlots[tabId] = GuildBankRightsAndSlots(tabId, uint8(packet.TabFlags[tabId]), uint32(packet.TabWithdrawItemLimit[tabId]));
167167

168-
TC_LOG_DEBUG("guild", "CMSG_GUILD_RANK [{}]: Rank: {} ({})", GetPlayerInfo(), packet.RankName, packet.RankID);
168+
TC_LOG_DEBUG("guild", "CMSG_GUILD_RANK [{}]: Rank: {} ({})", GetPlayerInfo(), std::string_view(packet.RankName), packet.RankID);
169169

170170
guild->HandleSetRankInfo(this, packet.RankID, packet.RankName, packet.Flags, packet.WithdrawGoldLimit, rightsAndSlots);
171171
}
172172

173173
void WorldSession::HandleGuildAddRankOpcode(WorldPackets::Guild::GuildAddRank& packet)
174174
{
175-
TC_LOG_DEBUG("guild", "CMSG_GUILD_ADD_RANK [{}]: Rank: {}", GetPlayerInfo(), packet.Name);
175+
TC_LOG_DEBUG("guild", "CMSG_GUILD_ADD_RANK [{}]: Rank: {}", GetPlayerInfo(), std::string_view(packet.Name));
176176

177177
if (Guild* guild = GetPlayer()->GetGuild())
178178
guild->HandleAddNewRank(this, packet.Name);
@@ -188,7 +188,7 @@ void WorldSession::HandleGuildDeleteRank(WorldPackets::Guild::GuildDeleteRank& /
188188

189189
void WorldSession::HandleGuildUpdateInfoText(WorldPackets::Guild::GuildUpdateInfoText& packet)
190190
{
191-
TC_LOG_DEBUG("guild", "CMSG_GUILD_INFO_TEXT [{}]: {}", GetPlayerInfo(), packet.InfoText);
191+
TC_LOG_DEBUG("guild", "CMSG_GUILD_INFO_TEXT [{}]: {}", GetPlayerInfo(), std::string_view(packet.InfoText));
192192

193193
if (Guild* guild = GetPlayer()->GetGuild())
194194
guild->HandleSetInfo(this, packet.InfoText);
@@ -341,7 +341,7 @@ void WorldSession::HandleGuildBankBuyTab(WorldPackets::Guild::GuildBankBuyTab& p
341341
void WorldSession::HandleGuildBankUpdateTab(WorldPackets::Guild::GuildBankUpdateTab& packet)
342342
{
343343
TC_LOG_DEBUG("guild", "CMSG_GUILD_BANK_UPDATE_TAB [{}]: [{}], TabId: {}, Name: {}, Icon: {}"
344-
, GetPlayerInfo(), packet.Banker.ToString(), packet.BankTab, packet.Name, packet.Icon);
344+
, GetPlayerInfo(), packet.Banker.ToString(), packet.BankTab, std::string_view(packet.Name), std::string_view(packet.Icon));
345345

346346
if (!packet.Name.empty() && !packet.Icon.empty())
347347
if (GetPlayer()->GetGameObjectIfCanInteractWith(packet.Banker, GAMEOBJECT_TYPE_GUILD_BANK))
@@ -367,7 +367,7 @@ void WorldSession::HandleGuildBankTextQuery(WorldPackets::Guild::GuildBankTextQu
367367

368368
void WorldSession::HandleGuildBankSetTabText(WorldPackets::Guild::GuildBankSetTabText& packet)
369369
{
370-
TC_LOG_DEBUG("guild", "CMSG_SET_GUILD_BANK_TEXT [{}]: TabId: {}, Text: {}", GetPlayerInfo(), packet.Tab, packet.TabText);
370+
TC_LOG_DEBUG("guild", "CMSG_SET_GUILD_BANK_TEXT [{}]: TabId: {}, Text: {}", GetPlayerInfo(), packet.Tab, std::string_view(packet.TabText));
371371

372372
if (Guild* guild = GetPlayer()->GetGuild())
373373
guild->SetBankTabText(packet.Tab, packet.TabText);

‎src/server/scripts/Commands/cs_event.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class event_commandscript : public CommandScript
114114
std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE);
115115
std::string lengthStr = secsToTimeString(eventData.length * MINUTE);
116116

117-
handler->PSendSysMessage(LANG_EVENT_INFO, eventId, eventData.description.c_str(), activeStr,
117+
handler->PSendSysMessage(LANG_EVENT_INFO, *eventId, eventData.description.c_str(), activeStr,
118118
startTimeStr.c_str(), endTimeStr.c_str(), occurenceStr.c_str(), lengthStr.c_str(),
119119
nextStr.c_str());
120120
return true;
@@ -142,7 +142,7 @@ class event_commandscript : public CommandScript
142142
GameEventMgr::ActiveEvents const& activeEvents = sGameEventMgr->GetActiveEventList();
143143
if (activeEvents.find(eventId) != activeEvents.end())
144144
{
145-
handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, eventId);
145+
handler->PSendSysMessage(LANG_EVENT_ALREADY_ACTIVE, *eventId);
146146
handler->SetSentErrorMessage(true);
147147
return false;
148148
}
@@ -174,7 +174,7 @@ class event_commandscript : public CommandScript
174174

175175
if (activeEvents.find(eventId) == activeEvents.end())
176176
{
177-
handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, eventId);
177+
handler->PSendSysMessage(LANG_EVENT_NOT_ACTIVE, *eventId);
178178
handler->SetSentErrorMessage(true);
179179
return false;
180180
}

‎src/server/scripts/Commands/cs_go.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class go_commandscript : public CommandScript
236236
TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(nodeId);
237237
if (!node)
238238
{
239-
handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, nodeId);
239+
handler->PSendSysMessage(LANG_COMMAND_GOTAXINODENOTFOUND, *nodeId);
240240
handler->SetSentErrorMessage(true);
241241
return false;
242242
}
@@ -248,7 +248,7 @@ class go_commandscript : public CommandScript
248248
AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(areaTriggerId);
249249
if (!at)
250250
{
251-
handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, areaTriggerId);
251+
handler->PSendSysMessage(LANG_COMMAND_GOAREATRNOTFOUND, *areaTriggerId);
252252
handler->SetSentErrorMessage(true);
253253
return false;
254254
}

‎src/server/scripts/Commands/cs_gobject.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class gobject_commandscript : public CommandScript
110110
GameObjectTemplate const* objectInfo = sObjectMgr->GetGameObjectTemplate(objectId);
111111
if (!objectInfo)
112112
{
113-
handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, objectId);
113+
handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, *objectId);
114114
handler->SetSentErrorMessage(true);
115115
return false;
116116
}
@@ -119,7 +119,7 @@ class gobject_commandscript : public CommandScript
119119
{
120120
// report to DB errors log as in loading case
121121
TC_LOG_ERROR("sql.sql", "Gameobject (Entry {} GoType: {}) have invalid displayId ({}), not spawned.", *objectId, objectInfo->type, objectInfo->displayId);
122-
handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, objectId);
122+
handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA, *objectId);
123123
handler->SetSentErrorMessage(true);
124124
return false;
125125
}
@@ -159,7 +159,7 @@ class gobject_commandscript : public CommandScript
159159
/// @todo is it really necessary to add both the real and DB table guid here ?
160160
sObjectMgr->AddGameobjectToGrid(guidLow, sObjectMgr->GetGameObjectData(guidLow));
161161

162-
handler->PSendSysMessage(LANG_GAMEOBJECT_ADD, objectId, objectInfo->name.c_str(), guidLow, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
162+
handler->PSendSysMessage(LANG_GAMEOBJECT_ADD, *objectId, objectInfo->name.c_str(), guidLow, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
163163
return true;
164164
}
165165

@@ -173,7 +173,7 @@ class gobject_commandscript : public CommandScript
173173

174174
if (!sObjectMgr->GetGameObjectTemplate(objectId))
175175
{
176-
handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, objectId);
176+
handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, *objectId);
177177
handler->SetSentErrorMessage(true);
178178
return false;
179179
}

‎src/server/scripts/Commands/cs_list.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class list_commandscript : public CommandScript
7878
CreatureTemplate const* cInfo = sObjectMgr->GetCreatureTemplate(creatureId);
7979
if (!cInfo)
8080
{
81-
handler->PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, creatureId);
81+
handler->PSendSysMessage(LANG_COMMAND_INVALIDCREATUREID, *creatureId);
8282
handler->SetSentErrorMessage(true);
8383
return false;
8484
}
@@ -153,7 +153,7 @@ class list_commandscript : public CommandScript
153153
while (result->NextRow());
154154
}
155155

156-
handler->PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE, creatureId, creatureCount);
156+
handler->PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE, *creatureId, creatureCount);
157157

158158
return true;
159159
}
@@ -356,7 +356,7 @@ class list_commandscript : public CommandScript
356356
GameObjectTemplate const* gInfo = sObjectMgr->GetGameObjectTemplate(gameObjectId);
357357
if (!gInfo)
358358
{
359-
handler->PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, gameObjectId);
359+
handler->PSendSysMessage(LANG_COMMAND_LISTOBJINVALIDID, *gameObjectId);
360360
handler->SetSentErrorMessage(true);
361361
return false;
362362
}
@@ -432,7 +432,7 @@ class list_commandscript : public CommandScript
432432
while (result->NextRow());
433433
}
434434

435-
handler->PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE, gameObjectId, objectCount);
435+
handler->PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE, *gameObjectId, objectCount);
436436

437437
return true;
438438
}

‎src/server/scripts/Commands/cs_misc.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ class misc_commandscript : public CommandScript
14361436
// prevent generation all items with itemset field value '0'
14371437
if (*itemSetId == 0)
14381438
{
1439-
handler->PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, itemSetId);
1439+
handler->PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, *itemSetId);
14401440
handler->SetSentErrorMessage(true);
14411441
return false;
14421442
}
@@ -1477,7 +1477,7 @@ class misc_commandscript : public CommandScript
14771477

14781478
if (!found)
14791479
{
1480-
handler->PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, itemSetId);
1480+
handler->PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND, *itemSetId);
14811481
handler->SetSentErrorMessage(true);
14821482
return false;
14831483
}
@@ -1545,7 +1545,7 @@ class misc_commandscript : public CommandScript
15451545
SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skillId);
15461546
if (!skillLine)
15471547
{
1548-
handler->PSendSysMessage(LANG_INVALID_SKILL_ID, skillId);
1548+
handler->PSendSysMessage(LANG_INVALID_SKILL_ID, *skillId);
15491549
handler->SetSentErrorMessage(true);
15501550
return false;
15511551
}
@@ -1563,7 +1563,7 @@ class misc_commandscript : public CommandScript
15631563
// add the skill to the player's book with step 1 (which is the first rank, in most cases something
15641564
// like 'Apprentice <skill>'.
15651565
target->SetSkill(skillId, targetHasSkill ? target->GetSkillStep(skillId) : 1, level, max);
1566-
handler->PSendSysMessage(LANG_SET_SKILL, skillId, skillLine->DisplayName[handler->GetSessionDbcLocale()], handler->GetNameLink(target).c_str(), level, max);
1566+
handler->PSendSysMessage(LANG_SET_SKILL, *skillId, skillLine->DisplayName[handler->GetSessionDbcLocale()], handler->GetNameLink(target).c_str(), level, max);
15671567
return true;
15681568
}
15691569

‎src/server/scripts/Commands/cs_titles.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class titles_commandscript : public CommandScript
7373
CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(titleId);
7474
if (!titleInfo)
7575
{
76-
handler->PSendSysMessage(LANG_INVALID_TITLE_ID, titleId);
76+
handler->PSendSysMessage(LANG_INVALID_TITLE_ID, *titleId);
7777
handler->SetSentErrorMessage(true);
7878
return false;
7979
}
@@ -84,7 +84,7 @@ class titles_commandscript : public CommandScript
8484
target->SetTitle(titleInfo);
8585
target->SetUInt32Value(PLAYER_CHOSEN_TITLE, titleInfo->MaskID);
8686

87-
handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, titleId, titleNameStr, tNameLink);
87+
handler->PSendSysMessage(LANG_TITLE_CURRENT_RES, *titleId, titleNameStr, tNameLink);
8888

8989
return true;
9090
}
@@ -106,7 +106,7 @@ class titles_commandscript : public CommandScript
106106
CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(titleId);
107107
if (!titleInfo)
108108
{
109-
handler->PSendSysMessage(LANG_INVALID_TITLE_ID, titleId);
109+
handler->PSendSysMessage(LANG_INVALID_TITLE_ID, *titleId);
110110
handler->SetSentErrorMessage(true);
111111
return false;
112112
}
@@ -115,7 +115,7 @@ class titles_commandscript : public CommandScript
115115
std::string titleNameStr = fmt::sprintf(target->GetNativeGender() == GENDER_MALE ? titleInfo->Name[handler->GetSessionDbcLocale()] : titleInfo->Name1[handler->GetSessionDbcLocale()], target->GetName());
116116

117117
target->SetTitle(titleInfo);
118-
handler->PSendSysMessage(LANG_TITLE_ADD_RES, titleId, titleNameStr, tNameLink);
118+
handler->PSendSysMessage(LANG_TITLE_ADD_RES, *titleId, titleNameStr, tNameLink);
119119

120120
return true;
121121
}
@@ -137,7 +137,7 @@ class titles_commandscript : public CommandScript
137137
CharTitlesEntry const* titleInfo = sCharTitlesStore.LookupEntry(titleId);
138138
if (!titleInfo)
139139
{
140-
handler->PSendSysMessage(LANG_INVALID_TITLE_ID, titleId);
140+
handler->PSendSysMessage(LANG_INVALID_TITLE_ID, *titleId);
141141
handler->SetSentErrorMessage(true);
142142
return false;
143143
}
@@ -147,7 +147,7 @@ class titles_commandscript : public CommandScript
147147
std::string tNameLink = handler->GetNameLink(target);
148148
std::string titleNameStr = fmt::sprintf(target->GetNativeGender() == GENDER_MALE ? titleInfo->Name[handler->GetSessionDbcLocale()] : titleInfo->Name1[handler->GetSessionDbcLocale()], target->GetName());
149149

150-
handler->PSendSysMessage(LANG_TITLE_REMOVE_RES, titleId, titleNameStr, tNameLink);
150+
handler->PSendSysMessage(LANG_TITLE_REMOVE_RES, *titleId, titleNameStr, tNameLink);
151151

152152
if (!target->HasTitle(target->GetInt32Value(PLAYER_CHOSEN_TITLE)))
153153
{

0 commit comments

Comments
 (0)