diff options
author | Shauren <shauren.trinity@gmail.com> | 2025-05-11 23:34:45 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2025-05-11 23:34:45 +0200 |
commit | 05eb63c8a2de1e7a6387d7c93f8568b8918f3ea8 (patch) | |
tree | b0e5997b6bf884353f5735af7fdf35e7f2dd8332 | |
parent | 4fec76cbdafd0a798f20359a4bda9a929a36c1cc (diff) |
Scripts/Misc: Update ScriptPCH content to include most commonly headers
9 files changed, 9 insertions, 17 deletions
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 58f6d982f08..cd74bb7857e 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -559,7 +559,7 @@ public: if (faction.Flags.HasFlag(ReputationFlags::Inactive)) ss << handler->GetTrinityString(LANG_FACTION_INACTIVE); - handler->SendSysMessage(ss.str().c_str()); + handler->SendSysMessage(ss.view()); } return true; diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index c46a140ac01..85bbcbabe72 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -38,7 +38,6 @@ EndScriptData */ #include "Transport.h" #include "Util.h" #include "WorldSession.h" -#include <sstream> using namespace Trinity::ChatCommands; diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 4a11296f806..70b8a122cc4 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -226,7 +226,7 @@ public: "(POW(position_x - {}, 2) + POW(position_y - {}, 2) + POW(position_z - {}, 2)) AS order_ FROM gameobject " "LEFT OUTER JOIN game_event_gameobject on gameobject.guid = game_event_gameobject.guid WHERE map = '{}' {} ORDER BY order_ ASC LIMIT 10", handler->GetSession()->GetPlayer()->GetPositionX(), handler->GetSession()->GetPlayer()->GetPositionY(), handler->GetSession()->GetPlayer()->GetPositionZ(), - handler->GetSession()->GetPlayer()->GetMapId(), eventFilter.str()); + handler->GetSession()->GetPlayer()->GetMapId(), eventFilter.view()); } if (!result) diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index 5eb1cb14940..9badba72873 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -38,7 +38,6 @@ EndScriptData */ #include "Util.h" #include "World.h" #include "WorldSession.h" -#include <sstream> using namespace Trinity::ChatCommands; diff --git a/src/server/scripts/Commands/cs_list.cpp b/src/server/scripts/Commands/cs_list.cpp index 14313e86cf0..f552ab05115 100644 --- a/src/server/scripts/Commands/cs_list.cpp +++ b/src/server/scripts/Commands/cs_list.cpp @@ -39,7 +39,6 @@ EndScriptData */ #include "RBAC.h" #include "SpellAuraEffects.h" #include "WorldSession.h" -#include <sstream> using namespace Trinity::ChatCommands; @@ -463,10 +462,9 @@ public: if (!ShouldListAura(aura->GetSpellInfo(), spellId, namePart, handler->GetSessionDbcLocale())) continue; - std::ostringstream ss_name; - ss_name << "|cffffffff|Hspell:" << aura->GetId() << "|h[" << name << "]|h|r"; + std::string ss_name = Trinity::StringFormat("|cffffffff|Hspell:{}|h[{}]|h|r", aura->GetId(), name); - handler->PSendSysMessage(LANG_COMMAND_TARGET_AURADETAIL, aura->GetId(), (handler->GetSession() ? ss_name.str().c_str() : name), + handler->PSendSysMessage(LANG_COMMAND_TARGET_AURADETAIL, aura->GetId(), (handler->GetSession() ? ss_name.c_str() : name), aurApp->GetEffectMask(), aura->GetCharges(), aura->GetStackAmount(), aurApp->GetSlot(), aura->GetDuration(), aura->GetMaxDuration(), (aura->IsPassive() ? passiveStr : ""), (talent ? talentStr : ""), aura->GetCasterGUID().IsPlayer() ? "player" : "creature", @@ -587,10 +585,9 @@ public: if (handler->GetSession()) { uint32 color = ItemQualityColors[itemTemplate->GetQuality()]; - std::ostringstream itemStr; - itemStr << "|c" << std::hex << color << "|Hitem:" << item_entry << ":0:0:0:0:0:0:0:" << handler->GetSession()->GetPlayer()->GetLevel() - << ":0:0:0:0:0|h[" << itemTemplate->GetName(handler->GetSessionDbcLocale()) << "]|h|r"; - handler->PSendSysMessage(LANG_LIST_MAIL_INFO_ITEM, itemStr.str().c_str(), item_entry, item_guid, item_count); + std::string itemStr = Trinity::StringFormat("|c{:X}|Hitem:{}:0:0:0:0:0:0:0:{}:0:0:0:0:0|h[{}]|h|r", + color, item_entry, handler->GetSession()->GetPlayer()->GetLevel(), itemTemplate->GetName(handler->GetSessionDbcLocale())); + handler->PSendSysMessage(LANG_LIST_MAIL_INFO_ITEM, itemStr.c_str(), item_entry, item_guid, item_count); } else handler->PSendSysMessage(LANG_LIST_MAIL_INFO_ITEM, itemTemplate->GetName(handler->GetSessionDbcLocale()), item_entry, item_guid, item_count); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index dcecb904c58..2dcb56ae4e4 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -24,7 +24,6 @@ #include "Map.h" #include "MotionMaster.h" #include "TemporarySummon.h" -#include <sstream> /* 0 - Selin Fireheart diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 830925b6fbc..86e241375cf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -28,7 +28,6 @@ #include "ScriptMgr.h" #include "TemporarySummon.h" #include <array> -#include <sstream> #include <unordered_map> #include <unordered_set> #include <vector> diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 1950401a20a..9409f8e21ce 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -17,14 +17,13 @@ #include "ScriptMgr.h" #include "AreaBoundary.h" +#include "Creature.h" #include "CreatureAI.h" #include "EventMap.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "naxxramas.h" -#include "TemporarySummon.h" -#include <sstream> BossBoundaryData const boundaries = { diff --git a/src/server/scripts/ScriptPCH.h b/src/server/scripts/ScriptPCH.h index c17231d3f64..77653365927 100644 --- a/src/server/scripts/ScriptPCH.h +++ b/src/server/scripts/ScriptPCH.h @@ -35,4 +35,4 @@ #include "SpellMgr.h" #include "SpellScript.h" #include "StringFormat.h" -#include <sstream> +#include "TemporarySummon.h" |