summaryrefslogtreecommitdiff
path: root/core/array.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-08-17 13:31:08 +0200
committerGitHub <noreply@github.com>2019-08-17 13:31:08 +0200
commitde4aabe89b7b68677f145f21c956183bbc92f686 (patch)
tree20b2e819d599d6d1bd459bb51880c31e97cfe825 /core/array.cpp
parent40640a01dc90be00e55e4eef3c7800401ef63b18 (diff)
parent71d71d55b5c0d6da4d1555823ac432bf0b33389a (diff)
Merge pull request #31244 from Unholydeath/BB_ChangeErrorMacros
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Diffstat (limited to 'core/array.cpp')
-rw-r--r--core/array.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/core/array.cpp b/core/array.cpp
index a334af2c04..108d9f7386 100644
--- a/core/array.cpp
+++ b/core/array.cpp
@@ -133,18 +133,12 @@ void Array::erase(const Variant &p_value) {
}
Variant Array::front() const {
- if (_p->array.size() == 0) {
- ERR_EXPLAIN("Can't take value from empty array");
- ERR_FAIL_V(Variant());
- }
+ ERR_FAIL_COND_V_MSG(_p->array.size() == 0, Variant(), "Can't take value from empty array.");
return operator[](0);
}
Variant Array::back() const {
- if (_p->array.size() == 0) {
- ERR_EXPLAIN("Can't take value from empty array");
- ERR_FAIL_V(Variant());
- }
+ ERR_FAIL_COND_V_MSG(_p->array.size() == 0, Variant(), "Can't take value from empty array.");
return operator[](_p->array.size() - 1);
}