asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed nativescript getter and setter logic

Browse source
This commit is contained in:
Bastiaan Olij 2018-07-27 23:45:29 +10:00
parent bfb21be871
commit 8a914f17b0
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/gdnative/nativescript/nativescript.cpp
View file

@ -556,12 +556,17 @@ bool NativeScriptInstance::set(const StringName &p_name, const Variant &p_value)
Variant name = p_name; Variant name = p_name;
const Variant *args[2] = { &name, &p_value }; const Variant *args[2] = { &name, &p_value };
E->get().method.method((godot_object *)owner, godot_variant result;
result = E->get().method.method((godot_object *)owner,
E->get().method.method_data, E->get().method.method_data,
userdata, userdata,
2, 2,
(godot_variant **)args); (godot_variant **)args);
return true; bool handled = *(Variant *)&result;
godot_variant_destroy(&result);
if (handled) {
return true;
}
} }
script_data = script_data->base_data; script_data = script_data->base_data;
@ -596,10 +601,9 @@ bool NativeScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
(godot_variant **)args); (godot_variant **)args);
r_ret = *(Variant *)&result; r_ret = *(Variant *)&result;
godot_variant_destroy(&result); godot_variant_destroy(&result);
if (r_ret.get_type() == Variant::NIL) { if (r_ret.get_type() != Variant::NIL) {
return false; return true;
} }
return true;
} }
script_data = script_data->base_data; script_data = script_data->base_data;