diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-12-17 16:30:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 16:30:34 +0100 |
| commit | 8d52eea52b4914a26409823047fc2ffd82c294f0 (patch) | |
| tree | a68ec2039a9a527cf1e0fb7f2c169b17531336f5 /modules/gdscript/gdscript_compiler.cpp | |
| parent | c023d41036f676572c43421670b2961991487884 (diff) | |
| parent | e1c63fee86a0f9682988258618fd992f431c5ec0 (diff) | |
Merge pull request #70000 from rune-scape/find-more-classes
GDScript: Fix built-in script `find_class` bugs
Diffstat (limited to 'modules/gdscript/gdscript_compiler.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_compiler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 4740b9b5a9..50588110c4 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -117,8 +117,7 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D result.builtin_type = p_datatype.builtin_type; result.native_type = p_datatype.native_type; - String root_name = p_datatype.class_type->fqcn.get_slice("::", 0); - bool is_local_class = !root_name.is_empty() && root_name == main_script->fully_qualified_name; + bool is_local_class = parser->has_class(p_datatype.class_type); Ref<GDScript> script; if (is_local_class) { @@ -2300,7 +2299,7 @@ Error GDScriptCompiler::_populate_class_members(GDScript *p_script, const GDScri return ERR_COMPILATION_FAILED; } - if (base.ptr() == main_script || main_script->is_subclass(base.ptr())) { + if (main_script->has_class(base.ptr())) { Error err = _populate_class_members(base.ptr(), p_class->base_type.class_type, p_keep_state); if (err) { return err; |