godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #1396 from Spooner/fix_sprintf_errors

Browse Source 
Fix sprintf errors
This commit is contained in:
Juan Linietsky
2015-03-22 15:03:32 -03:00
parent 7436f0bb37 748311ec42
commit 0302ea5b82
5 changed files with 102 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/gdscript/gd_script.cpp
View File

@@ -337,9 +337,10 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
Variant::evaluate(op,*a,*b,*dst,valid);
if (!valid) {
if (false && dst->get_type()==Variant::STRING) {
if (dst->get_type()==Variant::STRING) {
//return a string when invalid with the error
err_text=*dst;
err_text += " in operator '"+Variant::get_operator_name(op)+"'.";
} else {
err_text="Invalid operands '"+Variant::get_type_name(a->get_type())+"' and '"+Variant::get_type_name(b->get_type())+"' in operator '"+Variant::get_operator_name(op)+"'.";
}