diff options
| author | Juan Linietsky | 2014-05-01 11:34:10 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-05-01 11:34:10 -0300 |
| commit | 6572d5128856b2ec55a2c417c92e584899f4906f (patch) | |
| tree | 9e01d6efab14567bfff5dd7b8b3b858d83b1868e /modules/gdscript/gd_script.h | |
| parent | 4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97 (diff) | |
| download | godot-6572d5128856b2ec55a2c417c92e584899f4906f.tar.gz godot-6572d5128856b2ec55a2c417c92e584899f4906f.tar.zst godot-6572d5128856b2ec55a2c417c92e584899f4906f.zip | |
-Fixes to OpenSSL compilation (more)
-Fix bug in GDScript, now static functions can call static functions.
Diffstat (limited to 'modules/gdscript/gd_script.h')
| -rw-r--r-- | modules/gdscript/gd_script.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h index 55bc547e8..983899240 100644 --- a/modules/gdscript/gd_script.h +++ b/modules/gdscript/gd_script.h @@ -75,13 +75,14 @@ public: ADDR_MASK=((1<<ADDR_BITS)-1), ADDR_TYPE_MASK=~ADDR_MASK, ADDR_TYPE_SELF=0, - ADDR_TYPE_MEMBER=1, - ADDR_TYPE_CLASS_CONSTANT=2, - ADDR_TYPE_LOCAL_CONSTANT=3, - ADDR_TYPE_STACK=4, - ADDR_TYPE_STACK_VARIABLE=5, - ADDR_TYPE_GLOBAL=6, - ADDR_TYPE_NIL=7 + ADDR_TYPE_CLASS=1, + ADDR_TYPE_MEMBER=2, + ADDR_TYPE_CLASS_CONSTANT=3, + ADDR_TYPE_LOCAL_CONSTANT=4, + ADDR_TYPE_STACK=5, + ADDR_TYPE_STACK_VARIABLE=6, + ADDR_TYPE_GLOBAL=7, + ADDR_TYPE_NIL=8 }; struct StackDebug { @@ -139,9 +140,9 @@ public: int get_max_stack_size() const; int get_default_argument_count() const; int get_default_argument_addr(int p_idx) const; - GDScript *get_script() const { return _script; } + GDScript *get_script() const { return _script; } - void debug_get_stack_member_state(int p_line,List<Pair<StringName,int> > *r_stackvars) const; + void debug_get_stack_member_state(int p_line,List<Pair<StringName,int> > *r_stackvars) const; _FORCE_INLINE_ bool is_empty() const { return _code_size==0; } @@ -183,6 +184,7 @@ friend class GDInstance; friend class GDFunction; friend class GDCompiler; friend class GDFunctions; + Variant _static_ref; //used for static call Ref<GDNativeClass> native; Ref<GDScript> base; GDScript *_base; //fast pointer access |