Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #70771 from kleonc/main-loop-set-after-resolved

Browse source 
Ensure `MainLoop` and its custom script is set right after it's resolved
This commit is contained in:
Yuri Sizov 2023-07-12 17:15:59 +02:00
commit 95da8e1394
3 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/main.cpp
View file

@ -2917,7 +2917,7 @@ bool Main::start() {
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_initialize_script(script_res);
script_loop->set_script(script_res);
main_loop = script_loop;
} else {
return false;
@ -2940,7 +2940,7 @@ bool Main::start() {
OS::get_singleton()->alert("Error: Invalid MainLoop script base type: " + script_base);
ERR_FAIL_V_MSG(false, vformat("The global class %s does not inherit from SceneTree or MainLoop.", main_loop_type));
}
script_loop->set_initialize_script(script_res);
script_loop->set_script(script_res);
main_loop = script_loop;
}
}
@ -2965,6 +2965,8 @@ bool Main::start() {
}
}
OS::get_singleton()->set_main_loop(main_loop);
SceneTree *sml = Object::cast_to<SceneTree>(main_loop);
if (sml) {
#ifdef DEBUG_ENABLED
@ -3284,8 +3286,6 @@ bool Main::start() {
DisplayServer::get_singleton()->set_icon(icon);
}
OS::get_singleton()->set_main_loop(main_loop);
if (movie_writer) {
movie_writer->begin(DisplayServer::get_singleton()->window_get_size(), fixed_fps, Engine::get_singleton()->get_write_movie_path());
}