From 1ecce50e06ebdde10500c5f72b9a0f5813b1c89b Mon Sep 17 00:00:00 2001 From: 天鹿 <18535853+PkllonG@users.noreply.github.com> Date: Fri, 12 Apr 2024 21:55:54 +0800 Subject: feat(Core/Scripts): Optimize LootScript (#18715) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update LootScript.h --- src/server/game/Scripting/ScriptDefines/LootScript.cpp | 15 +++++++++------ src/server/game/Scripting/ScriptDefines/LootScript.h | 9 ++++++++- 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'src/server/game/Scripting/ScriptDefines') diff --git a/src/server/game/Scripting/ScriptDefines/LootScript.cpp b/src/server/game/Scripting/ScriptDefines/LootScript.cpp index 6b49ff5a1b..a6231b4a48 100644 --- a/src/server/game/Scripting/ScriptDefines/LootScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/LootScript.cpp @@ -23,13 +23,16 @@ void ScriptMgr::OnLootMoney(Player* player, uint32 gold) { ASSERT(player); - ExecuteScript([&](LootScript* script) - { - script->OnLootMoney(player, gold); - }); + CALL_ENABLED_HOOKS(LootScript, LOOTHOOK_ON_LOOT_MONEY, script->OnLootMoney(player, gold)); } -LootScript::LootScript(const char* name) : ScriptObject(name) +LootScript::LootScript(const char* name, std::vector enabledHooks) + : ScriptObject(name, LOOTHOOK_END) { - ScriptRegistry::AddScript(this); + // If empty - enable all available hooks. + if (enabledHooks.empty()) + for (uint16 i = 0; i < LOOTHOOK_END; ++i) + enabledHooks.emplace_back(i); + + ScriptRegistry::AddScript(this, std::move(enabledHooks)); } diff --git a/src/server/game/Scripting/ScriptDefines/LootScript.h b/src/server/game/Scripting/ScriptDefines/LootScript.h index d717113836..445abdddcc 100644 --- a/src/server/game/Scripting/ScriptDefines/LootScript.h +++ b/src/server/game/Scripting/ScriptDefines/LootScript.h @@ -19,11 +19,18 @@ #define SCRIPT_OBJECT_LOOT_SCRIPT_H_ #include "ScriptObject.h" +#include + +enum LootHook +{ + LOOTHOOK_ON_LOOT_MONEY, + LOOTHOOK_END +}; class LootScript : public ScriptObject { protected: - LootScript(const char* name); + LootScript(const char* name, std::vector enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; } -- cgit v1.2.3