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

Fixes to constants in scope

Browse Source
This commit is contained in:
Juan Linietsky
2014-05-02 12:40:34 -03:00
parent 6572d51288
commit f1d3b30a45
2 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gdscript/gd_script.cpp
View File

@ -76,16 +76,21 @@ Variant *GDFunction::_get_variant(int p_address,GDInstance *p_instance,GDScript
case ADDR_TYPE_CLASS_CONSTANT: {
//todo change to index!
GDScript *s=p_script;
GDScript *o=p_script;
ERR_FAIL_INDEX_V(address,_global_names_count,NULL);
const StringName *sn = &_global_names_ptr[address];
while(s) {
Map<StringName,Variant>::Element *E=s->constants.find(*sn);
if (E) {
return &E->get();
while(o) {
GDScript *s=o;
while(s) {
Map<StringName,Variant>::Element *E=s->constants.find(*sn);
if (E) {
return &E->get();
}
s=s->_base;
}
s=s->_base;
o=o->_owner;
}