bitsquid_dt/Darktide-Mod-Framework
bitsquid_dt/Darktide-Mod-Framework
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Hooks's active status is based on mod's enabled status now.

Browse source 
Also, allow hook_enable and hook_disable to be delayed as well.
This commit is contained in:
FireSiku 2018-06-11 03:15:44 -04:00
parent bee94c1665
commit 8a13ec1bf9
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
vmf/scripts/mods/vmf/modules/core/hooks.lua
View file

@ -204,7 +204,7 @@ local function create_hook(self, orig, obj, method, handler, func_name, hook_typ
-- Check to make sure it wasn't hooked before -- Check to make sure it wasn't hooked before
if not _registry[self][orig] then if not _registry[self][orig] then
_registry[self][orig] = { active = true } _registry[self][orig] = { active = self:is_enabled() }
local hook_registry = _registry.hooks[hook_type] local hook_registry = _registry.hooks[hook_type]
-- Add to the hook to registry. Origin hooks are unique, so we check for that too. -- Add to the hook to registry. Origin hooks are unique, so we check for that too.
@ -318,8 +318,17 @@ local function generic_hook_toggle(self, obj, method, enabled_state)
local obj, success = get_object_reference(obj) --luacheck: ignore local obj, success = get_object_reference(obj) --luacheck: ignore
if obj and not success then if obj and not success then
self:error("(%s): object doesn't exist.", func_name) if _delaying_enabled and type(obj) == "string" then
-- Call this func at a later time, using upvalues.
self:info("(%s): [%s.%s] needs to be delayed.", func_name, obj, method)
table.insert(_delayed, function()
generic_hook_toggle(self, obj, method, enabled_state)
end)
return return
else
self:error("(%s): trying to toggle hook on object that doesn't exist: %s", func_name, obj)
return
end
end end
local orig = get_orig_function(self, obj, method) local orig = get_orig_function(self, obj, method)