maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #35224 from ChibiDenDen/constant_lookup_through_subclass_instance

Browse source 
Fix constant access in base class through subclass instance
This commit is contained in:
Rémi Verschelde 2020-01-17 06:58:00 +01:00 committed by GitHub
parent 045a5ce14a 9ffa9a6bac
commit ba7aca4199
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/gdscript/gdscript_function.cpp
View file

@ -67,23 +67,23 @@ Variant *GDScriptFunction::_get_variant(int p_address, GDScriptInstance *p_insta
case ADDR_TYPE_CLASS_CONSTANT: {
//todo change to index!
GDScript *o = p_script;
GDScript *s = p_script;
#ifdef DEBUG_ENABLED
ERR_FAIL_INDEX_V(address, _global_names_count, NULL);
#endif
const StringName *sn = &_global_names_ptr[address];
while (o) {
GDScript *s = o;
while (s) {
while (s) {
GDScript *o = s;
while (o) {
Map<StringName, Variant>::Element *E = s->constants.find(*sn);
Map<StringName, Variant>::Element *E = o->constants.find(*sn);
if (E) {
return &E->get();
}
s = s->_base;
o = o->_owner;
}
o = o->_owner;
s = s->_base;
}
ERR_FAIL_V_MSG(NULL, "GDScriptCompiler bug.");