summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gdscript.cpp
diff options
context:
space:
mode:
authorDmitrii Maganov <vonagam@gmail.com>2023-03-08 22:06:29 +0200
committerDmitrii Maganov <vonagam@gmail.com>2023-03-13 01:40:13 +0200
commit4e34cf238aeff209f5823685d7b66ae8d66118cb (patch)
treef1baec0d9450fc2c550f2a8ad9c9a8012802d9d6 /modules/gdscript/gdscript.cpp
parent550a7798510810d238b733a54f69da71b2a2d152 (diff)
downloadredot-engine-4e34cf238aeff209f5823685d7b66ae8d66118cb.tar.gz
GDScript: Change parser representation of class extends
Diffstat (limited to 'modules/gdscript/gdscript.cpp')
-rw-r--r--modules/gdscript/gdscript.cpp6
1 files changed, 3 insertions, 3 deletions
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<StringName> extend_classes = subclass->extends;
+ Vector<GDScriptParser::IdentifierNode *> extend_classes = subclass->extends;
Ref<FileAccess> 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;