From f8ad7017dd69e3853ed5912ac6151bc56b6265a0 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 12 Feb 2022 21:36:46 +0100 Subject: Core/Misc: Move (or delete) constructors and destructors to .cpp files (avoids compiling them in every file that includes them) --- src/server/game/Scripting/ScriptMgr.cpp | 88 ++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 12 deletions(-) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 1ca7264aa2d..cbec3f39834 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1196,7 +1196,7 @@ ScriptMgr::ScriptMgr() { } -ScriptMgr::~ScriptMgr() { } +ScriptMgr::~ScriptMgr() = default; ScriptMgr* ScriptMgr::instance() { @@ -2374,24 +2374,32 @@ ServerScript::ServerScript(char const* name) ScriptRegistry::Instance()->AddScript(this); } +ServerScript::~ServerScript() = default; + WorldScript::WorldScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +WorldScript::~WorldScript() = default; + FormulaScript::FormulaScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +FormulaScript::~FormulaScript() = default; + UnitScript::UnitScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +UnitScript::~UnitScript() = default; + WorldMapScript::WorldMapScript(char const* name, uint32 mapId) : ScriptObject(name), MapScript(sMapStore.LookupEntry(mapId)) { @@ -2404,6 +2412,8 @@ WorldMapScript::WorldMapScript(char const* name, uint32 mapId) ScriptRegistry::Instance()->AddScript(this); } +WorldMapScript::~WorldMapScript() = default; + InstanceMapScript::InstanceMapScript(char const* name, uint32 mapId) : ScriptObject(name), MapScript(sMapStore.LookupEntry(mapId)) { @@ -2416,6 +2426,8 @@ InstanceMapScript::InstanceMapScript(char const* name, uint32 mapId) ScriptRegistry::Instance()->AddScript(this); } +InstanceMapScript::~InstanceMapScript() = default; + BattlegroundMapScript::BattlegroundMapScript(char const* name, uint32 mapId) : ScriptObject(name), MapScript(sMapStore.LookupEntry(mapId)) { @@ -2428,30 +2440,42 @@ BattlegroundMapScript::BattlegroundMapScript(char const* name, uint32 mapId) ScriptRegistry::Instance()->AddScript(this); } +BattlegroundMapScript::~BattlegroundMapScript() = default; + ItemScript::ItemScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +ItemScript::~ItemScript() = default; + CreatureScript::CreatureScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +CreatureScript::~CreatureScript() = default; + GameObjectScript::GameObjectScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +GameObjectScript::~GameObjectScript() = default; + AreaTriggerScript::AreaTriggerScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +AreaTriggerScript::~AreaTriggerScript() = default; + +OnlyOnceAreaTriggerScript::~OnlyOnceAreaTriggerScript() = default; + bool OnlyOnceAreaTriggerScript::OnTrigger(Player* player, AreaTriggerEntry const* trigger) { uint32 const triggerId = trigger->ID; @@ -2473,95 +2497,111 @@ BattlefieldScript::BattlefieldScript(char const* name) ScriptRegistry::Instance()->AddScript(this); } +BattlefieldScript::~BattlefieldScript() = default; + BattlegroundScript::BattlegroundScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +BattlegroundScript::~BattlegroundScript() = default; + OutdoorPvPScript::OutdoorPvPScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +OutdoorPvPScript::~OutdoorPvPScript() = default; + CommandScript::CommandScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +CommandScript::~CommandScript() = default; + WeatherScript::WeatherScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +WeatherScript::~WeatherScript() = default; + AuctionHouseScript::AuctionHouseScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +AuctionHouseScript::~AuctionHouseScript() = default; + ConditionScript::ConditionScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +ConditionScript::~ConditionScript() = default; + VehicleScript::VehicleScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +VehicleScript::~VehicleScript() = default; + DynamicObjectScript::DynamicObjectScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +DynamicObjectScript::~DynamicObjectScript() = default; + TransportScript::TransportScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +TransportScript::~TransportScript() = default; + AchievementScript::AchievementScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +AchievementScript::~AchievementScript() = default; + AchievementCriteriaScript::AchievementCriteriaScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +AchievementCriteriaScript::~AchievementCriteriaScript() = default; + PlayerScript::PlayerScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +PlayerScript::~PlayerScript() = default; + AccountScript::AccountScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } -SceneScript::SceneScript(char const* name) - : ScriptObject(name) -{ - ScriptRegistry::Instance()->AddScript(this); -} - -QuestScript::QuestScript(char const* name) - : ScriptObject(name) -{ - ScriptRegistry::Instance()->AddScript(this); -} +AccountScript::~AccountScript() = default; GuildScript::GuildScript(char const* name) : ScriptObject(name) @@ -2569,24 +2609,48 @@ GuildScript::GuildScript(char const* name) ScriptRegistry::Instance()->AddScript(this); } +GuildScript::~GuildScript() = default; + GroupScript::GroupScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +GroupScript::~GroupScript() = default; + AreaTriggerEntityScript::AreaTriggerEntityScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +AreaTriggerEntityScript::~AreaTriggerEntityScript() = default; + ConversationScript::ConversationScript(char const* name) : ScriptObject(name) { ScriptRegistry::Instance()->AddScript(this); } +ConversationScript::~ConversationScript() = default; + +SceneScript::SceneScript(char const* name) + : ScriptObject(name) +{ + ScriptRegistry::Instance()->AddScript(this); +} + +SceneScript::~SceneScript() = default; + +QuestScript::QuestScript(char const* name) + : ScriptObject(name) +{ + ScriptRegistry::Instance()->AddScript(this); +} + +QuestScript::~QuestScript() = default; + // Specialize for each script type class like so: template class TC_GAME_API ScriptRegistry; template class TC_GAME_API ScriptRegistry; -- cgit v1.2.3