diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-12-10 10:21:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-10 10:21:19 +0100 |
| commit | f6ea295bb10da4bad623433c74086072fb0e2a6a (patch) | |
| tree | 5a72d27fc186b99b19280cb6f421e7031c84c639 /modules/gdscript/gdscript_utility_functions.cpp | |
| parent | ae86d907e75c3de9b039e7cc77e521bc9739e6dc (diff) | |
| parent | d531869a7c3c73d79c6ead71c7736f285bf6e1a1 (diff) | |
Merge pull request #69467 from rune-scape/rune-subclass-script-path
GDScript: Fix subclass script path issues
Diffstat (limited to 'modules/gdscript/gdscript_utility_functions.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_utility_functions.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_utility_functions.cpp b/modules/gdscript/gdscript_utility_functions.cpp index bcbe8b8d2b..27b6792e84 100644 --- a/modules/gdscript/gdscript_utility_functions.cpp +++ b/modules/gdscript/gdscript_utility_functions.cpp @@ -294,6 +294,7 @@ struct GDScriptUtilityFunctionsDefinitions { } GDScript *p = base.ptr(); + String path = p->get_script_path(); Vector<StringName> sname; while (p->_owner) { @@ -302,7 +303,7 @@ struct GDScriptUtilityFunctionsDefinitions { } sname.reverse(); - if (!p->path.is_resource_file()) { + if (!path.is_resource_file()) { r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument = 0; r_error.expected = Variant::DICTIONARY; @@ -317,7 +318,7 @@ struct GDScriptUtilityFunctionsDefinitions { Dictionary d; d["@subpath"] = cp; - d["@path"] = p->get_path(); + d["@path"] = path; for (const KeyValue<StringName, GDScript::MemberInfo> &E : base->member_indices) { if (!d.has(E.key)) { |