From b2b5c495e176209a450dcedc94a7d82292463232 Mon Sep 17 00:00:00 2001 From: Saracen Date: Sat, 9 Apr 2016 03:17:02 +0100 Subject: [PATCH] Subclasses can now extend from other subclasses contained in scripts derived from relative paths. (cherry picked from commit d643a40f95b7f7392f143f68d970a0db8c61c491) --- modules/gdscript/gd_compiler.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index 1f0cedf27c1..d26773ff013 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -1421,7 +1421,22 @@ Error GDCompiler::_parse_class(GDScript *p_script,GDScript *p_owner,const GDPars if (path.is_rel_path()) { - String base = p_script->get_path(); + String base; + + if (p_owner) { + GDScript *current_class = p_owner; + while (current_class != NULL) { + base=current_class->get_path(); + if (base=="") + current_class = current_class->_owner; + else + break; + } + } + else { + base = p_script->get_path(); + } + if (base=="" || base.is_rel_path()) { _set_error("Could not resolve relative path for parent class: "+path,p_class); return ERR_FILE_NOT_FOUND;