Merge pull request #36868 from Calinou/improve-cli-script-error-message

Tweak the error message when trying to run an invalid script from CLI

Merge pull request #36868 from Calinou/improve-cli-script-error-message
30ab5c9b · Rémi Verschelde · GitHub · 45a036fe · 2ab9515b · 30ab5c9b
Unverified Commit 30ab5c9b authored Apr 16, 2020 by Rémi Verschelde Committed by GitHub Apr 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

main.cpp main/main.cpp +2 -2

No files found.
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -1675,7 +1675,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);
@@ -1683,7 +1683,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);