maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Tweak the error message when trying to run an invalid script from CLI
This commit is contained in:
Rémi Verschelde 2020-04-16 12:41:12 +02:00 committed by GitHub
parent 45a036feec 2ab9515b07
commit 30ab5c9baa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -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);