diff options
Diffstat (limited to 'src/server/game')
-rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommandTags.h | 4 | ||||
-rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Handlers/AuctionHouseHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Warden/Warden.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Warden/WardenCheckMgr.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index c7f7d0c0029..39fda4c7c0e 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -26,9 +26,9 @@ #include "Util.h" #include <boost/preprocessor/repetition/repeat.hpp> #include <boost/preprocessor/punctuation/comma_if.hpp> +#include <fmt/ostream.h> #include <cmath> #include <cstring> -#include <iostream> #include <string> #include <string_view> #include <tuple> @@ -154,7 +154,7 @@ namespace Trinity::ChatCommands operator uint32() const { return _id; } operator std::string const& () const { return _name; } - operator std::string_view() const { return { _name }; } + operator std::string_view() const { return _name; } uint32 GetID() const { return _id; } std::string const& GetName() const { return _name; } diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index a24540434f4..69177e832c8 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -540,7 +540,7 @@ void LoadDB2(std::bitset<TOTAL_LOCALES>& availableDb2Locales, std::vector<std::s { if (e.code() == std::errc::no_such_file_or_directory) { - errlist.push_back(Trinity::StringFormat("File %s does not exist", db2Path + localeNames[defaultLocale] + '/' + storage->GetFileName())); + errlist.push_back(Trinity::StringFormat("File %s%s/%s does not exist", db2Path.c_str(), localeNames[defaultLocale], storage->GetFileName().c_str())); } else throw; diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 758e0989af0..8b183c71892 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -740,7 +740,7 @@ void WorldSession::HandleAuctionSellCommodity(WorldPackets::AuctionHouse::Auctio { Item* logItem = items2.begin()->second.first; sLog->outCommand(GetAccountId(), "GM %s (Account: %u) create auction: %s (Entry: %u Count: " UI64FMTD ")", - GetPlayerName().c_str(), GetAccountId(), logItem->GetNameForLocaleIdx(sWorld->GetDefaultDbcLocale()), logItem->GetEntry(), totalCount); + GetPlayerName().c_str(), GetAccountId(), logItem->GetNameForLocaleIdx(sWorld->GetDefaultDbcLocale()).c_str(), logItem->GetEntry(), totalCount); } CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index 1f27bda664a..7d0a4aca2c6 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -208,7 +208,7 @@ char const* Warden::ApplyPenalty(WardenCheck const* check) std::string banReason = "Warden Anticheat Violation"; // Check can be NULL, for example if the client sent a wrong signature in the warden packet (CHECKSUM FAIL) if (check) - banReason += Trinity::StringFormat(": %s (CheckId: %u", check->Comment, uint32(check->CheckId)); + banReason += Trinity::StringFormat(": %s (CheckId: %u", check->Comment.c_str(), uint32(check->CheckId)); sWorld->BanAccount(BAN_ACCOUNT, accountName, sWorld->getIntConfig(CONFIG_WARDEN_CLIENT_BAN_DURATION), banReason, "Server"); diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index 7fff6a69cce..66f86f16e61 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -111,7 +111,7 @@ void WardenCheckMgr::LoadWardenChecks() continue; } - std::string str = fmt::sprintf("%04u", id); + std::string str = Trinity::StringFormat("%04u", id); ASSERT(str.size() == 4); std::copy(str.begin(), str.end(), wardenCheck.IdStr.begin()); } |