godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Subclasses can now extend from other subclasses contained in scripts derived from relative paths. 

(cherry picked from commit d643a40f95)
This commit is contained in:
Saracen 2016-04-09 03:17:02 +01:00 committed by Rémi Verschelde
parent e367c6cdd8
commit b2b5c495e1
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gdscript/gd_compiler.cpp
View File

@ -1421,7 +1421,22 @@ Error GDCompiler::_parse_class(GDScript *p_script,GDScript *p_owner,const GDPars
if (path.is_rel_path()) { 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()) { if (base=="" || base.is_rel_path()) {
_set_error("Could not resolve relative path for parent class: "+path,p_class); _set_error("Could not resolve relative path for parent class: "+path,p_class);
return ERR_FILE_NOT_FOUND; return ERR_FILE_NOT_FOUND;