From f860915ae0a1f09ff554a0b37777a57fc6e29ece Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 11 Jun 2016 19:43:38 -0300
Subject: Made many built-in gdscript functions return more descriptive errors,
 closes #5150

---
 modules/gdscript/gd_function.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/gdscript/gd_function.cpp')

diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp
index 04522aadc..9d438998c 100644
--- a/modules/gdscript/gd_function.cpp
+++ b/modules/gdscript/gd_function.cpp
@@ -727,7 +727,12 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a
 
 
 					String methodstr = GDFunctions::get_func_name(func);
-					err_text=_get_call_error(err,"built-in function '"+methodstr+"'",(const Variant**)argptrs);
+					if (dst->get_type()==Variant::STRING) {
+						//call provided error string
+						err_text="Error calling built-in function '"+methodstr+"': "+String(*dst);
+					} else {
+						err_text=_get_call_error(err,"built-in function '"+methodstr+"'",(const Variant**)argptrs);
+					}
 					break;
 				}
 				ip+=argc+1;
-- 
cgit v1.2.3-70-g09d2