Skip to content

feat: allow hooks to return a table with the function declared inside #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LordMidas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow hooks to return a table with the function declared inside #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions modern_hooks/q_object.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@

function newSlot( _q, _key, _value )
{
// Allow wrapping the function in a table so it can be declared with a name that's preserved during hooks
if (typeof _value == "table")
{
if (_key in _value)
_value = _value[_key];
else
::Hooks.errorAndThrow(format("Mod %s (%s) is trying to add key \'%s\' to %s by wrapping it inside a table. But the table is missing that key.", _q.__Mod.getID(), _q.__Mod.getName(), _key, this.buildTargetString(_q)));
}

if (typeof _value != "function")
::Hooks.errorAndThrow(format("Mod %s (%s) is trying to add key \'%s\' to %s. The key's value must be a function. Fields must instead be added to the class's \'m\' table.", _q.__Mod.getID(), _q.__Mod.getName(), _key, this.buildTargetString(_q)));
local p = _q.__Prototype;
Expand Down Expand Up @@ -239,6 +248,10 @@
newFunction = _value();
else
newFunction = _value(oldFunction);

// Allow wrapping the function in a table so it can be declared with a name that's preserved during hooks
if (typeof newFunction == "table")
newFunction = newFunction[_key];
}
catch (error)
{
Expand Down