godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 2ab9515b07)
This commit is contained in:
Hugo Locurcio 2020-03-06 22:57:02 +01:00 committed by Rémi Verschelde
parent 679474c576
commit 25b353fd32
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@ -1582,7 +1582,7 @@ bool Main::start() {
return false; 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(); StringName instance_type = script_res->get_instance_base_type();
Object *obj = ClassDB::instance(instance_type); Object *obj = ClassDB::instance(instance_type);
@ -1590,7 +1590,7 @@ bool Main::start() {
if (!script_loop) { if (!script_loop) {
if (obj) if (obj)
memdelete(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); script_loop->set_init_script(script_res);