Skip to content

[BUGFIX] Fix Scripted Class Extending not working with multiple scripted layers #401

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
TechnikTil wants to merge 1 commit into
base: experimental
Choose a base branch
from
+17 −9
Open

[BUGFIX] Fix Scripted Class Extending not working with multiple scripted layers #401

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
26 changes: 17 additions & 9 deletions polymod/hscript/_internal/HScriptedClassMacro.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,18 +995,26 @@ class HScriptedClassMacro
{_asc.callFunction($v{funcName}, [$a{func_callArgs}]); return;}) : (macro return _asc.callFunction($v{funcName}, [$a{func_callArgs}]))
}
}
// If another scripted class is being extended, call if the function exists there
else if ((_asc.superClass is polymod.hscript._internal.PolymodScriptClass)
&& _asc.superClass.hasScriptFunction($v{funcName}))
else
{
var _super = (_asc.superClass : polymod.hscript._internal.PolymodScriptClass);
$
// If another scripted class is being extended, call if the function exists there
var _super = _asc.superClass;
while (_super is polymod.hscript._internal.PolymodScriptClass)
{
doesReturnVoid ? (macro
var _scriptSuper = (_super : polymod.hscript._internal.PolymodScriptClass);
if (_scriptSuper.hasScriptFunction($v{funcName}))
{
$
{
_super.callFunction($v{funcName}, [$a{func_callArgs}]);
return;
}) : (macro return _super.callFunction($v{funcName}, [$a{func_callArgs}]))
doesReturnVoid ? (macro
{
_scriptSuper.callFunction($v{funcName}, [$a{func_callArgs}]);
return;
}) : (macro return _scriptSuper.callFunction($v{funcName}, [$a{func_callArgs}]))
}
}

_super = _scriptSuper.superClass;
}
}
}
Expand Down