From 4e34cf238aeff209f5823685d7b66ae8d66118cb Mon Sep 17 00:00:00 2001 From: Dmitrii Maganov Date: Wed, 8 Mar 2023 22:06:29 +0200 Subject: GDScript: Change parser representation of class extends --- modules/gdscript/gdscript.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/gdscript/gdscript.cpp') diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 1a1d021dbc..2646c1ad15 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -2483,7 +2483,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b subclass = nullptr; break; } else { - Vector extend_classes = subclass->extends; + Vector extend_classes = subclass->extends; Ref subfile = FileAccess::open(subclass->extends_path, FileAccess::READ); if (subfile.is_null()) { @@ -2513,7 +2513,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b } const GDScriptParser::ClassNode *inner_class = subclass->members[i].m_class; - if (inner_class->identifier->name == extend_classes[0]) { + if (inner_class->identifier->name == extend_classes[0]->name) { extend_classes.remove_at(0); found = true; subclass = inner_class; @@ -2527,7 +2527,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b } } } else if (subclass->extends.size() == 1) { - *r_base_type = subclass->extends[0]; + *r_base_type = subclass->extends[0]->name; subclass = nullptr; } else { break; -- cgit v1.2.3