diff options
| author | George Marques <george@gmarqu.es> | 2015-09-20 16:17:30 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2015-09-20 16:17:30 -0300 |
| commit | 1d45c9a04c4c755843a162b872e59680fcb9c94d (patch) | |
| tree | 3cebd305835a643f233cdee7f4f08e5946df4f99 /modules/gdscript | |
| parent | 889d21e0049a0e84d6d44db9b80193f93fd62f17 (diff) | |
Make dict2inst set internal members of instance
Fix #2490
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_functions.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp index 37ddb2bc41..6f51ac5312 100644 --- a/modules/gdscript/gd_functions.cpp +++ b/modules/gdscript/gd_functions.cpp @@ -904,6 +904,15 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va r_ret = gdscr->_new(NULL,0,r_error); + GDInstance *ins = static_cast<GDInstance*>(static_cast<Object*>(r_ret)->get_script_instance()); + Ref<GDScript> gd_ref = ins->get_script(); + + for(Map<StringName,GDScript::MemberInfo>::Element *E = gd_ref->member_indices.front(); E; E = E->next()) { + if(d.has(E->key())) { + ins->members[E->get().index] = d[E->key()]; + } + } + } break; case HASH: { |