diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-05-01 11:34:10 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-05-01 11:34:10 -0300 |
| commit | 6572d5128856b2ec55a2c417c92e584899f4906f (patch) | |
| tree | 9e01d6efab14567bfff5dd7b8b3b858d83b1868e /modules/gdscript/gd_script.cpp | |
| parent | 4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97 (diff) | |
| download | redot-engine-6572d5128856b2ec55a2c417c92e584899f4906f.tar.gz | |
-Fixes to OpenSSL compilation (more)
-Fix bug in GDScript, now static functions can call static functions.
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
| -rw-r--r-- | modules/gdscript/gd_script.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 75bb47ceab..299a7d3e54 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -61,6 +61,10 @@ Variant *GDFunction::_get_variant(int p_address,GDInstance *p_instance,GDScript } return &self; } break; + case ADDR_TYPE_CLASS: { + + return &p_script->_static_ref; + } break; case ADDR_TYPE_MEMBER: { //member indexing is O(1) if (!p_instance) { @@ -1678,6 +1682,7 @@ Ref<GDScript> GDScript::get_base() const { GDScript::GDScript() { + _static_ref=this; valid=false; subclass_count=0; initializer=NULL; |