|
@@ -109,7 +109,9 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D
|
|
// Locate class by constructing the path to it and following that path
|
|
// Locate class by constructing the path to it and following that path
|
|
GDScriptParser::ClassNode *class_type = p_datatype.class_type;
|
|
GDScriptParser::ClassNode *class_type = p_datatype.class_type;
|
|
if (class_type) {
|
|
if (class_type) {
|
|
- if ((!main_script->path.is_empty() && class_type->fqcn.begins_with(main_script->path)) || (!main_script->name.is_empty() && class_type->fqcn.begins_with(main_script->name))) {
|
|
|
|
|
|
+ const bool is_inner_by_path = (!main_script->path.is_empty()) && (class_type->fqcn.split("::")[0] == main_script->path);
|
|
|
|
+ const bool is_inner_by_name = (!main_script->name.is_empty()) && (class_type->fqcn.split("::")[0] == main_script->name);
|
|
|
|
+ if (is_inner_by_path || is_inner_by_name) {
|
|
// Local class.
|
|
// Local class.
|
|
List<StringName> names;
|
|
List<StringName> names;
|
|
while (class_type->outer) {
|
|
while (class_type->outer) {
|