diff options
| author | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
| commit | f8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch) | |
| tree | 3b798318132cca7eccfbca5818ab55656a2896d7 /core/func_ref.cpp | |
| parent | 1d418afe863c9e553b69174ce63aef203c46d2f0 (diff) | |
| download | godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip | |
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to 'core/func_ref.cpp')
| -rw-r--r-- | core/func_ref.cpp | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/core/func_ref.cpp b/core/func_ref.cpp index 48a903d49..1b8c01a81 100644 --- a/core/func_ref.cpp +++ b/core/func_ref.cpp @@ -28,55 +28,50 @@ /*************************************************************************/ #include "func_ref.h" -Variant FuncRef::call_func(const Variant** p_args, int p_argcount, Variant::CallError& r_error) { +Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error) { - if (id==0) { - r_error.error=Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL; + if (id == 0) { + r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL; return Variant(); } - Object* obj = ObjectDB::get_instance(id); + Object *obj = ObjectDB::get_instance(id); if (!obj) { - r_error.error=Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL; + r_error.error = Variant::CallError::CALL_ERROR_INSTANCE_IS_NULL; return Variant(); } - return obj->call(function,p_args,p_argcount,r_error); - + return obj->call(function, p_args, p_argcount, r_error); } -void FuncRef::set_instance(Object *p_obj){ +void FuncRef::set_instance(Object *p_obj) { ERR_FAIL_NULL(p_obj); - id=p_obj->get_instance_ID(); + id = p_obj->get_instance_ID(); } -void FuncRef::set_function(const StringName& p_func){ +void FuncRef::set_function(const StringName &p_func) { - function=p_func; + function = p_func; } void FuncRef::_bind_methods() { { MethodInfo mi; - mi.name="call_func"; + mi.name = "call_func"; Vector<Variant> defargs; - for(int i=0;i<10;i++) { - mi.arguments.push_back( PropertyInfo( Variant::NIL, "arg"+itos(i))); + for (int i = 0; i < 10; i++) { + mi.arguments.push_back(PropertyInfo(Variant::NIL, "arg" + itos(i))); defargs.push_back(Variant()); } - ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT,"call_func",&FuncRef::call_func,mi,defargs); - + ObjectTypeDB::bind_native_method(METHOD_FLAGS_DEFAULT, "call_func", &FuncRef::call_func, mi, defargs); } - ObjectTypeDB::bind_method(_MD("set_instance","instance"),&FuncRef::set_instance); - ObjectTypeDB::bind_method(_MD("set_function","name"),&FuncRef::set_function); - + ObjectTypeDB::bind_method(_MD("set_instance", "instance"), &FuncRef::set_instance); + ObjectTypeDB::bind_method(_MD("set_function", "name"), &FuncRef::set_function); } +FuncRef::FuncRef() { -FuncRef::FuncRef(){ - - id=0; + id = 0; } - |