From 2ab9515b0750b18717196e56ca63dae410e0f61f Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 6 Mar 2020 22:57:02 +0100 Subject: [PATCH] Tweak the error message when trying to run an invalid script from CLI --- main/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index d8a9cc87a7e..5d011f4f9c5 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1598,7 +1598,7 @@ bool Main::start() { return false; } - if (script_res->can_instance() /*&& script_res->inherits_from("SceneTreeScripted")*/) { + if (script_res->can_instance()) { StringName instance_type = script_res->get_instance_base_type(); Object *obj = ClassDB::instance(instance_type); @@ -1606,7 +1606,7 @@ bool Main::start() { if (!script_loop) { if (obj) memdelete(obj); - ERR_FAIL_V_MSG(false, "Can't load script '" + script + "', it does not inherit from a MainLoop type."); + ERR_FAIL_V_MSG(false, vformat("Can't load the script \"%s\" as it doesn't inherit from SceneTree or MainLoop.", script)); } script_loop->set_init_script(script_res);