asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4269 from SaracenOne/subclass_extend

Browse source 
Subclasses can now extend from other subclasses in relative scripts.
This commit is contained in:
Rémi Verschelde 2016-04-11 09:55:22 +02:00
commit 57cddf3811
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()) {
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;