diff options
author | Saracen <SaracenOne@gmail.com> | 2016-04-09 03:17:02 +0100 |
---|---|---|
committer | Saracen <SaracenOne@gmail.com> | 2016-04-09 03:23:33 +0100 |
commit | d643a40f95b7f7392f143f68d970a0db8c61c491 (patch) | |
tree | 7a8514bfff6537e36674cd2c348406385cb3919e /modules/gdscript | |
parent | d454e64f429affb89de036eed6daa5c6e5278492 (diff) |
Subclasses can now extend from other subclasses contained in scripts derived from relative paths.
Diffstat (limited to 'modules/gdscript')
-rw-r--r-- | modules/gdscript/gd_compiler.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index e8e8ce4e96..d38f5f3e35 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; |