asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21305 from Mr-Slurpy/expression-fix

Browse source 
Fixed bugs in expression class
This commit is contained in:
Rémi Verschelde 2018-08-23 12:10:54 +02:00 committed by GitHub
commit 92aafa898f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/math/expression.cpp
View file

@ -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) { 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) { switch (p_func) {
case MATH_SIN: { case MATH_SIN: {
@ -1916,7 +1916,7 @@ bool Expression::_execute(const Array &p_inputs, Object *p_instance, Expression:
bool valid; bool valid;
r_ret = base.get_named(index->name, &valid); r_ret = base.get_named(index->name, &valid);
if (!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; return true;
} }