northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix subclass finding in extend statement for sub-sub classes

Browse Source 
lookup was always done on top level script instead of advancing to subclass each time.
this commit changes the lookup to always be at last found subclass
This commit is contained in:
Dani Frank
2020-01-18 11:55:27 +02:00
parent f6a02b881a
commit 8f5e424c66
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gdscript_parser.cpp
View File

@ -5404,12 +5404,12 @@ void GDScriptParser::_determine_inheritance(ClassNode *p_class, bool p_recursive
ident += ("." + subclass);
if (base_script->get_subclasses().has(subclass)) {
if (find_subclass->get_subclasses().has(subclass)) {
find_subclass = base_script->get_subclasses()[subclass];
} else if (base_script->get_constants().has(subclass)) {
find_subclass = find_subclass->get_subclasses()[subclass];
} else if (find_subclass->get_constants().has(subclass)) {
Ref<GDScript> new_base_class = base_script->get_constants()[subclass];
Ref<GDScript> new_base_class = find_subclass->get_constants()[subclass];
if (new_base_class.is_null()) {
_set_error("Constant isn't a class: " + ident, p_class->line);
return;