Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Mark script base class constructors noexcept

Browse Source
This commit is contained in:
Shauren
2025-06-13 19:31:03 +02:00
parent 36332d2463
commit f94d87b00f
34 changed files with 166 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/server/game/Scripting/ScriptMgr.cpp
View File

@@ -150,8 +150,8 @@ enum Spells
class ScriptRegistryInterface
{
public:
ScriptRegistryInterface() { }
virtual ~ScriptRegistryInterface() { }
ScriptRegistryInterface() = default;
virtual ~ScriptRegistryInterface() = default;
ScriptRegistryInterface(ScriptRegistryInterface const&) = delete;
ScriptRegistryInterface(ScriptRegistryInterface&&) = delete;
@@ -183,7 +183,7 @@ class ScriptRegistry;
class ScriptRegistryCompositum
: public ScriptRegistryInterface
{
ScriptRegistryCompositum() { }
ScriptRegistryCompositum() noexcept = default;
template<class>
friend class ScriptRegistry;
@@ -273,7 +273,7 @@ public:
void QueueForDelayedDelete(T&& any)
{
_delayed_delete_queue.push_back(
std::make_unique<
std::make_unique<
DeleteableObject<typename std::decay<T>::type>
>(std::forward<T>(any))
);
@@ -317,7 +317,7 @@ class ScriptRegistry final
: public SpecializedScriptRegistry<
ScriptType, is_script_database_bound<ScriptType>::value>
{
ScriptRegistry()
ScriptRegistry() noexcept
{
sScriptRegistryCompositum->Register(this);
}
@@ -360,7 +360,7 @@ public:
virtual void BeforeUnload() { }
/// Called manually to sync scriptnames
virtual void OnScriptNamesSync() { };
virtual void OnScriptNamesSync() { }
};
template<typename ScriptType, typename Base>
@@ -1004,7 +1004,7 @@ class SpecializedScriptRegistry<ScriptType, true>
friend class CreatureGameObjectAreaTriggerConversationScriptRegistrySwapHooks;
public:
SpecializedScriptRegistry() { }
SpecializedScriptRegistry() noexcept = default;
typedef std::unordered_map<
uint32 /*script id*/,
@@ -1052,7 +1052,7 @@ public:
}
// Adds a database bound script
void AddScript(ScriptType* script)
void AddScript(ScriptType* script) noexcept
{
ASSERT(script,
"Tried to call AddScript with a nullpointer!");
@@ -1169,7 +1169,7 @@ public:
typedef std::unordered_multimap<std::string /*context*/, std::unique_ptr<ScriptType>> ScriptStoreType;
typedef typename ScriptStoreType::iterator ScriptStoreIteratorType;
SpecializedScriptRegistry() { }
SpecializedScriptRegistry() noexcept = default;
void ReleaseContext(std::string const& context) final override
{
@@ -1201,7 +1201,7 @@ public:
}
// Adds a non database bound script
void AddScript(ScriptType* script)
void AddScript(ScriptType* script) noexcept
{
ASSERT(script,
"Tried to call AddScript with a nullpointer!");
@@ -1266,7 +1266,7 @@ private:
if (!V) \
return R;
ScriptObject::ScriptObject(char const* name) : _name(name)
ScriptObject::ScriptObject(char const* name) noexcept : _name(name)
{
sScriptMgr->IncreaseScriptCount();
}
@@ -1420,8 +1420,8 @@ void ScriptMgr::FillSpellSummary()
UnitAI::FillAISpellInfo();
}
template<typename T, typename O>
void CreateSpellOrAuraScripts(uint32 spellId, std::vector<T*>& scriptVector, T*(SpellScriptLoader::*extractor)() const, O* objectInvoker)
template<typename T, Trinity::invocable_r<T*, SpellScriptLoader const*> GetScriptFn, typename O>
void CreateSpellOrAuraScripts(uint32 spellId, std::vector<T*>& scriptVector, GetScriptFn extractor, O* objectInvoker)
{
SpellScriptsBounds bounds = sObjectMgr->GetSpellScriptsBounds(spellId);
for (auto itr = bounds.first; itr != bounds.second; ++itr)
@@ -1430,11 +1430,11 @@ void CreateSpellOrAuraScripts(uint32 spellId, std::vector<T*>& scriptVector, T*(
if (!itr->second.second)
continue;
SpellScriptLoader* tmpscript = sScriptMgr->GetSpellScriptLoader(itr->second.first);
SpellScriptLoader const* tmpscript = sScriptMgr->GetSpellScriptLoader(itr->second.first);
if (!tmpscript)
continue;
T* script = (tmpscript->*extractor)();
T* script = extractor(tmpscript);
if (!script)
continue;
@@ -1451,12 +1451,12 @@ void CreateSpellOrAuraScripts(uint32 spellId, std::vector<T*>& scriptVector, T*(
void ScriptMgr::CreateSpellScripts(uint32 spellId, std::vector<SpellScript*>& scriptVector, Spell* invoker) const
{
CreateSpellOrAuraScripts(spellId, scriptVector, &SpellScriptLoader::GetSpellScript, invoker);
CreateSpellOrAuraScripts(spellId, scriptVector, [](SpellScriptLoader const* loader) { return loader->GetSpellScript(); }, invoker);
}
void ScriptMgr::CreateAuraScripts(uint32 spellId, std::vector<AuraScript*>& scriptVector, Aura* invoker) const
{
CreateSpellOrAuraScripts(spellId, scriptVector, &SpellScriptLoader::GetAuraScript, invoker);
CreateSpellOrAuraScripts(spellId, scriptVector, [](SpellScriptLoader const* loader) { return loader->GetAuraScript(); }, invoker);
}
SpellScriptLoader* ScriptMgr::GetSpellScriptLoader(uint32 scriptId)
@@ -2383,7 +2383,7 @@ void ScriptMgr::OnEventTrigger(WorldObject* object, WorldObject* invoker, uint32
tmpscript->OnTrigger(object, invoker, eventId);
}
SpellScriptLoader::SpellScriptLoader(char const* name)
SpellScriptLoader::SpellScriptLoader(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<SpellScriptLoader>::Instance()->AddScript(this);
@@ -2399,7 +2399,7 @@ AuraScript* SpellScriptLoader::GetAuraScript() const
return nullptr;
}
ServerScript::ServerScript(char const* name)
ServerScript::ServerScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<ServerScript>::Instance()->AddScript(this);
@@ -2431,7 +2431,7 @@ void ServerScript::OnPacketReceive(WorldSession* /*session*/, WorldPacket& /*pac
{
}
WorldScript::WorldScript(char const* name)
WorldScript::WorldScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<WorldScript>::Instance()->AddScript(this);
@@ -2471,7 +2471,7 @@ void WorldScript::OnShutdown()
{
}
FormulaScript::FormulaScript(char const* name)
FormulaScript::FormulaScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<FormulaScript>::Instance()->AddScript(this);
@@ -2508,7 +2508,7 @@ void FormulaScript::OnGroupRateCalculation(float& /*rate*/, uint32 /*count*/, bo
}
template <class TMap>
MapScript<TMap>::MapScript(MapEntry const* mapEntry) : _mapEntry(mapEntry)
MapScript<TMap>::MapScript(MapEntry const* mapEntry) noexcept : _mapEntry(mapEntry)
{
}
@@ -2547,7 +2547,7 @@ template class TC_GAME_API MapScript<Map>;
template class TC_GAME_API MapScript<InstanceMap>;
template class TC_GAME_API MapScript<BattlegroundMap>;
WorldMapScript::WorldMapScript(char const* name, uint32 mapId)
WorldMapScript::WorldMapScript(char const* name, uint32 mapId) noexcept
: ScriptObject(name), MapScript(sMapStore.LookupEntry(mapId))
{
if (!GetEntry())
@@ -2561,7 +2561,7 @@ WorldMapScript::WorldMapScript(char const* name, uint32 mapId)
WorldMapScript::~WorldMapScript() = default;
InstanceMapScript::InstanceMapScript(char const* name, uint32 mapId)
InstanceMapScript::InstanceMapScript(char const* name, uint32 mapId) noexcept
: ScriptObject(name), MapScript(sMapStore.LookupEntry(mapId))
{
if (!GetEntry())
@@ -2580,7 +2580,7 @@ InstanceScript* InstanceMapScript::GetInstanceScript(InstanceMap* /*map*/) const
return nullptr;
}
BattlegroundMapScript::BattlegroundMapScript(char const* name, uint32 mapId)
BattlegroundMapScript::BattlegroundMapScript(char const* name, uint32 mapId) noexcept
: ScriptObject(name), MapScript(sMapStore.LookupEntry(mapId))
{
if (!GetEntry())
@@ -2599,7 +2599,7 @@ BattlegroundScript* BattlegroundMapScript::GetBattlegroundScript(BattlegroundMap
return nullptr;
}
ItemScript::ItemScript(char const* name)
ItemScript::ItemScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<ItemScript>::Instance()->AddScript(this);
@@ -2632,7 +2632,7 @@ bool ItemScript::OnCastItemCombatSpell(Player* /*player*/, Unit* /*victim*/, Spe
return true;
}
UnitScript::UnitScript(char const* name)
UnitScript::UnitScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<UnitScript>::Instance()->AddScript(this);
@@ -2660,7 +2660,7 @@ void UnitScript::ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, in
{
}
CreatureScript::CreatureScript(char const* name)
CreatureScript::CreatureScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<CreatureScript>::Instance()->AddScript(this);
@@ -2668,7 +2668,7 @@ CreatureScript::CreatureScript(char const* name)
CreatureScript::~CreatureScript() = default;
GameObjectScript::GameObjectScript(char const* name)
GameObjectScript::GameObjectScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<GameObjectScript>::Instance()->AddScript(this);
@@ -2676,7 +2676,7 @@ GameObjectScript::GameObjectScript(char const* name)
GameObjectScript::~GameObjectScript() = default;
AreaTriggerScript::AreaTriggerScript(char const* name)
AreaTriggerScript::AreaTriggerScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<AreaTriggerScript>::Instance()->AddScript(this);
@@ -2711,7 +2711,7 @@ bool OnlyOnceAreaTriggerScript::OnTrigger(Player* player, AreaTriggerEntry const
void OnlyOnceAreaTriggerScript::ResetAreaTriggerDone(InstanceScript* instance, uint32 triggerId) { instance->ResetAreaTriggerDone(triggerId); }
void OnlyOnceAreaTriggerScript::ResetAreaTriggerDone(Player const* player, AreaTriggerEntry const* trigger) { if (InstanceScript* instance = player->GetInstanceScript()) ResetAreaTriggerDone(instance, trigger->ID); }
BattlefieldScript::BattlefieldScript(char const* name)
BattlefieldScript::BattlefieldScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<BattlefieldScript>::Instance()->AddScript(this);
@@ -2719,7 +2719,7 @@ BattlefieldScript::BattlefieldScript(char const* name)
BattlefieldScript::~BattlefieldScript() = default;
OutdoorPvPScript::OutdoorPvPScript(char const* name)
OutdoorPvPScript::OutdoorPvPScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<OutdoorPvPScript>::Instance()->AddScript(this);
@@ -2727,7 +2727,7 @@ OutdoorPvPScript::OutdoorPvPScript(char const* name)
OutdoorPvPScript::~OutdoorPvPScript() = default;
CommandScript::CommandScript(char const* name)
CommandScript::CommandScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<CommandScript>::Instance()->AddScript(this);
@@ -2735,7 +2735,7 @@ CommandScript::CommandScript(char const* name)
CommandScript::~CommandScript() = default;
WeatherScript::WeatherScript(char const* name)
WeatherScript::WeatherScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<WeatherScript>::Instance()->AddScript(this);
@@ -2751,7 +2751,7 @@ void WeatherScript::OnUpdate(Weather* /*weather*/, uint32 /*diff*/)
{
}
AuctionHouseScript::AuctionHouseScript(char const* name)
AuctionHouseScript::AuctionHouseScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<AuctionHouseScript>::Instance()->AddScript(this);
@@ -2775,7 +2775,7 @@ void AuctionHouseScript::OnAuctionExpire(AuctionHouseObject* /*ah*/, AuctionPost
{
}
ConditionScript::ConditionScript(char const* name)
ConditionScript::ConditionScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<ConditionScript>::Instance()->AddScript(this);
@@ -2788,7 +2788,7 @@ bool ConditionScript::OnConditionCheck(Condition const* /*condition*/, Condition
return true;
}
VehicleScript::VehicleScript(char const* name)
VehicleScript::VehicleScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<VehicleScript>::Instance()->AddScript(this);
@@ -2820,7 +2820,7 @@ void VehicleScript::OnRemovePassenger(Vehicle* /*veh*/, Unit* /*passenger*/)
{
}
DynamicObjectScript::DynamicObjectScript(char const* name)
DynamicObjectScript::DynamicObjectScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<DynamicObjectScript>::Instance()->AddScript(this);
@@ -2832,7 +2832,7 @@ void DynamicObjectScript::OnUpdate(DynamicObject* /*obj*/, uint32 /*diff*/)
{
}
TransportScript::TransportScript(char const* name)
TransportScript::TransportScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<TransportScript>::Instance()->AddScript(this);
@@ -2860,7 +2860,7 @@ void TransportScript::OnUpdate(Transport* /*transport*/, uint32 /*diff*/)
{
}
AchievementScript::AchievementScript(char const* name)
AchievementScript::AchievementScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<AchievementScript>::Instance()->AddScript(this);
@@ -2872,7 +2872,7 @@ void AchievementScript::OnCompleted(Player* /*player*/, AchievementEntry const*
{
}
AchievementCriteriaScript::AchievementCriteriaScript(char const* name)
AchievementCriteriaScript::AchievementCriteriaScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<AchievementCriteriaScript>::Instance()->AddScript(this);
@@ -2880,7 +2880,7 @@ AchievementCriteriaScript::AchievementCriteriaScript(char const* name)
AchievementCriteriaScript::~AchievementCriteriaScript() = default;
PlayerScript::PlayerScript(char const* name)
PlayerScript::PlayerScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<PlayerScript>::Instance()->AddScript(this);
@@ -3024,7 +3024,7 @@ void PlayerScript::OnPlayerChoiceResponse(Player* /*player*/, uint32 /*choiceId*
{
}
AccountScript::AccountScript(char const* name)
AccountScript::AccountScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<AccountScript>::Instance()->AddScript(this);
@@ -3056,7 +3056,7 @@ void AccountScript::OnFailedPasswordChange(uint32 /*accountId*/)
{
}
GuildScript::GuildScript(char const* name)
GuildScript::GuildScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<GuildScript>::Instance()->AddScript(this);
@@ -3110,7 +3110,7 @@ void GuildScript::OnBankEvent(Guild* /*guild*/, uint8 /*eventType*/, uint8 /*tab
{
}
GroupScript::GroupScript(char const* name)
GroupScript::GroupScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<GroupScript>::Instance()->AddScript(this);
@@ -3138,7 +3138,7 @@ void GroupScript::OnDisband(Group* /*group*/)
{
}
AreaTriggerEntityScript::AreaTriggerEntityScript(char const* name)
AreaTriggerEntityScript::AreaTriggerEntityScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<AreaTriggerEntityScript>::Instance()->AddScript(this);
@@ -3151,7 +3151,7 @@ AreaTriggerAI* AreaTriggerEntityScript::GetAI(AreaTrigger* /*at*/) const
return nullptr;
}
ConversationScript::ConversationScript(char const* name)
ConversationScript::ConversationScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<ConversationScript>::Instance()->AddScript(this);
@@ -3164,7 +3164,7 @@ ConversationAI* ConversationScript::GetAI(Conversation* /*conversation*/) const
return nullptr;
}
SceneScript::SceneScript(char const* name)
SceneScript::SceneScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<SceneScript>::Instance()->AddScript(this);
@@ -3188,7 +3188,7 @@ void SceneScript::OnSceneComplete(Player* /*player*/, uint32 /*sceneInstanceID*/
{
}
QuestScript::QuestScript(char const* name)
QuestScript::QuestScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<QuestScript>::Instance()->AddScript(this);
@@ -3208,7 +3208,7 @@ void QuestScript::OnQuestObjectiveChange(Player* /*player*/, Quest const* /*ques
{
}
WorldStateScript::WorldStateScript(char const* name)
WorldStateScript::WorldStateScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<WorldStateScript>::Instance()->AddScript(this);
@@ -3220,7 +3220,7 @@ void WorldStateScript::OnValueChange(int32 /*worldStateId*/, int32 /*oldValue*/,
{
}
EventScript::EventScript(char const* name)
EventScript::EventScript(char const* name) noexcept
: ScriptObject(name)
{
ScriptRegistry<EventScript>::Instance()->AddScript(this);