summaryrefslogtreecommitdiffstats
path: root/core/variant
diff options
context:
space:
mode:
authorDanil Alexeev <danil@alexeev.xyz>2024-08-30 21:09:30 +0300
committerDanil Alexeev <danil@alexeev.xyz>2024-08-30 21:09:30 +0300
commit49bcdf78a7ce5009d6f6ebce6ead31c2aa7a55b9 (patch)
tree0204ed74b55b5271ed72b5079abea2e34c95fcfd /core/variant
parenta5830f6eb9fe25fbb7e58a723dbea8509aec8a85 (diff)
downloadredot-engine-49bcdf78a7ce5009d6f6ebce6ead31c2aa7a55b9.tar.gz
Core: Сheck `r_error` after calling `callp()`
Diffstat (limited to 'core/variant')
-rw-r--r--core/variant/callable.cpp2
-rw-r--r--core/variant/variant.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/variant/callable.cpp b/core/variant/callable.cpp
index 667aae879c..9dff5c1e91 100644
--- a/core/variant/callable.cpp
+++ b/core/variant/callable.cpp
@@ -112,7 +112,7 @@ Error Callable::rpcp(int p_id, const Variant **p_arguments, int p_argcount, Call
argptrs[i + 2] = p_arguments[i];
}
- CallError tmp;
+ CallError tmp; // TODO: Check `tmp`?
Error err = (Error)obj->callp(SNAME("rpc_id"), argptrs, argcount, tmp).operator int64_t();
r_call_error.error = Callable::CallError::CALL_OK;
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp
index 24b30112bd..186643b024 100644
--- a/core/variant/variant.cpp
+++ b/core/variant/variant.cpp
@@ -2113,7 +2113,7 @@ Variant::operator ::RID() const {
}
#endif
Callable::CallError ce;
- Variant ret = _get_obj().obj->callp(CoreStringName(get_rid), nullptr, 0, ce);
+ const Variant ret = _get_obj().obj->callp(CoreStringName(get_rid), nullptr, 0, ce);
if (ce.error == Callable::CallError::CALL_OK && ret.get_type() == Variant::RID) {
return ret;
}