mirror of
https://github.com/godotengine/godot
synced 2024-09-05 12:58:29 +00:00
Merge pull request #36868 from Calinou/improve-cli-script-error-message
Tweak the error message when trying to run an invalid script from CLI
This commit is contained in:
commit
30ab5c9baa
|
@ -1675,7 +1675,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);
|
||||||
|
@ -1683,7 +1683,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);
|
||||||
|
|
Loading…
Reference in a new issue