diff --git a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.cpp index f9fa1c781..5a5a8de26 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* 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* 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* 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* 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* 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 enabledHooks) + : ScriptObject(name, WORLDOBJECTHOOK_END) { - ScriptRegistry::AddScript(this); + // If empty - enable all available hooks. + if (enabledHooks.empty()) + for (uint16 i = 0; i < WORLDOBJECTHOOK_END; ++i) + enabledHooks.emplace_back(i); + + ScriptRegistry::AddScript(this, std::move(enabledHooks)); } template class AC_GAME_API ScriptRegistry; diff --git a/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h b/src/server/game/Scripting/ScriptDefines/WorldObjectScript.h index 6f1a17c4f..84398629e 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 + +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 enabledHooks = std::vector()); public: [[nodiscard]] bool IsDatabaseBound() const override { return false; }