summaryrefslogtreecommitdiff
path: root/modules/gdscript/gdscript.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-01-24 09:56:22 +0100
committerGitHub <noreply@github.com>2019-01-24 09:56:22 +0100
commit7b4e7d56629638e73e30c4b39ca7494bda223960 (patch)
tree52a40da082b20be4fa43d3e100426ed81d41ae9d /modules/gdscript/gdscript.cpp
parent6d224e64437b748a92c59dcffe5a074339f3b497 (diff)
parent587c1c90cff876c27e4efc14fe976386dc7c85b4 (diff)
Merge pull request #25274 from vnen/gdscript-fixes
Some GDScript fixes
Diffstat (limited to 'modules/gdscript/gdscript.cpp')
-rw-r--r--modules/gdscript/gdscript.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index 9d263aa5e1..ae70525de5 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -642,7 +642,8 @@ Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p
if (E) {
if (!E->get()->is_static()) {
- WARN_PRINT(String("Can't call non-static function: '" + String(p_method) + "' in script.").utf8().get_data());
+ ERR_EXPLAIN("Can't call non-static function: '" + String(p_method) + "' in script.");
+ ERR_FAIL_V(Variant());
}
return E->get()->call(NULL, p_args, p_argcount, r_error);