diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-01 14:32:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 14:32:04 +0200 |
| commit | b0ce9401ffa731cc346ab6762fd0794709634428 (patch) | |
| tree | c2e6de01b9efec28c959dbfd5cd59a0973d432e7 /core/object.cpp | |
| parent | 531c92a53e5e7b9a1cb55249ef6086e874239872 (diff) | |
| parent | 3c154eb93b3a098354bf6d18a9428826ec193f90 (diff) | |
| download | redot-engine-b0ce9401ffa731cc346ab6762fd0794709634428.tar.gz | |
Merge pull request #30126 from qarmin/remove_unnecessary_code
Remove unnecessary code and add some error explanations
Diffstat (limited to 'core/object.cpp')
| -rw-r--r-- | core/object.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/object.cpp b/core/object.cpp index ee512ff23c..3367d6b6c3 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -742,13 +742,11 @@ void Object::call_multilevel(const StringName &p_method, const Variant **p_args, if (Object::cast_to<Reference>(this)) { ERR_EXPLAIN("Can't 'free' a reference."); ERR_FAIL(); - return; } if (_lock_index.get() > 1) { ERR_EXPLAIN("Object is locked and can't be freed."); ERR_FAIL(); - return; } #endif @@ -1467,7 +1465,7 @@ Error Object::connect(const StringName &p_signal, Object *p_to_object, const Str if (!signal_is_valid) { ERR_EXPLAIN("In Object of type '" + String(get_class()) + "': Attempt to connect nonexistent signal '" + p_signal + "' to method '" + p_to_object->get_class() + "." + p_to_method + "'"); - ERR_FAIL_COND_V(!signal_is_valid, ERR_INVALID_PARAMETER); + ERR_FAIL_V(ERR_INVALID_PARAMETER); } signal_map[p_signal] = Signal(); s = &signal_map[p_signal]; @@ -1517,7 +1515,7 @@ bool Object::is_connected(const StringName &p_signal, Object *p_to_object, const return false; ERR_EXPLAIN("Nonexistent signal: " + p_signal); - ERR_FAIL_COND_V(!s, false); + ERR_FAIL_V(false); } Signal::Target target(p_to_object->get_instance_id(), p_to_method); |