summaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptDefines
diff options
context:
space:
mode:
author天鹿 <18535853+PkllonG@users.noreply.github.com>2024-04-12 21:53:59 +0800
committerGitHub <noreply@github.com>2024-04-12 10:53:59 -0300
commit83c4562f3d4356f7c6fe279e072331840f06dadb (patch)
tree2977e33529ad0e683fac3629536560bd4312d044 /src/server/game/Scripting/ScriptDefines
parentd162817d33dcf9159ee72371cb8b41e321e6da1f (diff)
feat(Core/Scripts): Optimize WorldObjectScript (#18723)
* Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Update WorldObjectScript.h
Diffstat (limited to 'src/server/game/Scripting/ScriptDefines')
-rw-r--r--src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp35
-rw-r--r--src/server/game/Scripting/ScriptDefines/WorldObjectScript.h13
2 files changed, 25 insertions, 23 deletions
diff --git a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp
index f9fa1c7816..5a5a8de268 100644
--- a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp
+++ b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp
@@ -23,55 +23,46 @@ void ScriptMgr::OnWorldObjectDestroy(WorldObject* object)
{
ASSERT(object);
- ExecuteScript<WorldObjectScript>([&](WorldObjectScript* script)
- {
- script->OnWorldObjectDestroy(object);
- });
+ CALL_ENABLED_HOOKS(WorldObjectScript, WORLDOBJECTHOOK_ON_WORLD_OBJECT_DESTROY, script->OnWorldObjectDestroy(object));
}
void ScriptMgr::OnWorldObjectCreate(WorldObject* object)
{
ASSERT(object);
- ExecuteScript<WorldObjectScript>([&](WorldObjectScript* script)
- {
- script->OnWorldObjectCreate(object);
- });
+ CALL_ENABLED_HOOKS(WorldObjectScript, WORLDOBJECTHOOK_ON_WORLD_OBJECT_CREATE, script->OnWorldObjectCreate(object));
}
void ScriptMgr::OnWorldObjectSetMap(WorldObject* object, Map* map)
{
ASSERT(object);
- ExecuteScript<WorldObjectScript>([&](WorldObjectScript* script)
- {
- script->OnWorldObjectSetMap(object, map);
- });
+ CALL_ENABLED_HOOKS(WorldObjectScript, WORLDOBJECTHOOK_ON_WORLD_OBJECT_SET_MAP, script->OnWorldObjectSetMap(object, map));
}
void ScriptMgr::OnWorldObjectResetMap(WorldObject* object)
{
ASSERT(object);
- ExecuteScript<WorldObjectScript>([&](WorldObjectScript* script)
- {
- script->OnWorldObjectResetMap(object);
- });
+ CALL_ENABLED_HOOKS(WorldObjectScript, WORLDOBJECTHOOK_ON_WORLD_OBJECT_RESET_MAP, script->OnWorldObjectResetMap(object));
}
void ScriptMgr::OnWorldObjectUpdate(WorldObject* object, uint32 diff)
{
ASSERT(object);
- ExecuteScript<WorldObjectScript>([&](WorldObjectScript* script)
- {
- script->OnWorldObjectUpdate(object, diff);
- });
+ CALL_ENABLED_HOOKS(WorldObjectScript, WORLDOBJECTHOOK_ON_WORLD_OBJECT_UPDATE, script->OnWorldObjectUpdate(object, diff));
}
-WorldObjectScript::WorldObjectScript(const char* name) : ScriptObject(name)
+WorldObjectScript::WorldObjectScript(const char* name, std::vector<uint16> enabledHooks)
+ : ScriptObject(name, WORLDOBJECTHOOK_END)
{
- ScriptRegistry<WorldObjectScript>::AddScript(this);
+ // If empty - enable all available hooks.
+ if (enabledHooks.empty())
+ for (uint16 i = 0; i < WORLDOBJECTHOOK_END; ++i)
+ enabledHooks.emplace_back(i);
+
+ ScriptRegistry<WorldObjectScript>::AddScript(this, std::move(enabledHooks));
}
template class AC_GAME_API ScriptRegistry<WorldObjectScript>;
diff --git a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h
index 6f1a17c4f7..84398629e6 100644
--- a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h
+++ b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h
@@ -19,11 +19,22 @@
#define SCRIPT_OBJECT_WORLD_OBJECT_SCRIPT_H_
#include "ScriptObject.h"
+#include <vector>
+
+enum WorldObjectHook
+{
+ WORLDOBJECTHOOK_ON_WORLD_OBJECT_DESTROY,
+ WORLDOBJECTHOOK_ON_WORLD_OBJECT_CREATE,
+ WORLDOBJECTHOOK_ON_WORLD_OBJECT_SET_MAP,
+ WORLDOBJECTHOOK_ON_WORLD_OBJECT_RESET_MAP,
+ WORLDOBJECTHOOK_ON_WORLD_OBJECT_UPDATE,
+ WORLDOBJECTHOOK_END
+};
class WorldObjectScript : public ScriptObject
{
protected:
- WorldObjectScript(const char* name);
+ WorldObjectScript(const char* name, std::vector<uint16> enabledHooks = std::vector<uint16>());
public:
[[nodiscard]] bool IsDatabaseBound() const override { return false; }