summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eliasinski <danieleliasinski@msn.com>2018-08-22 04:58:27 -0400
committerDaniel Eliasinski <danieleliasinski@msn.com>2018-08-23 01:29:24 -0400
commitfb3506d796b1630305e2c5fcdfc509a0d81dda4f (patch)
tree7b48721bb56a0b0cdbf7ef2938bd16a79ea8caef
parente9cb03f33eb5e17ce3638c033299a4f919dab194 (diff)
Fixed bugs in expression class
-rw-r--r--core/math/expression.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/expression.cpp b/core/math/expression.cpp
index a161dbddba..1a79385a29 100644
--- a/core/math/expression.cpp
+++ b/core/math/expression.cpp
@@ -177,7 +177,7 @@ int Expression::get_func_argument_count(BuiltinFunc p_func) {
}
void Expression::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant *r_return, Variant::CallError &r_error, String &r_error_str) {
-
+ r_error.error = Variant::CallError::CALL_OK;
switch (p_func) {
case MATH_SIN: {
@@ -1916,7 +1916,7 @@ bool Expression::_execute(const Array &p_inputs, Object *p_instance, Expression:
bool valid;
r_ret = base.get_named(index->name, &valid);
if (!valid) {
- r_error_str = vformat(RTR("Invalid named index '%s' for base type "), String(index->name), Variant::get_type_name(base.get_type()));
+ r_error_str = vformat(RTR("Invalid named index '%s' for base type %s"), String(index->name), Variant::get_type_name(base.get_type()));
return true;
}