mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Initialise script engine off main thread (#22230)

Browse Source 
* Initialise script engine off main thread

* Do not run ScriptEngine.Tick() during initialisation/preloading

* Add 'Loading plugin engine…' string

* Add changelog entry

---------

Co-authored-by: Bas <Basssiiie@users.noreply.github.com>
This commit is contained in:
Aaron van Geffen
2024-07-09 20:19:01 +02:00
committed by GitHub
parent bc0f6c4489
commit 4bfd3f3369
8 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/openrct2/Context.cpp
View File

@@ -523,18 +523,14 @@ namespace OpenRCT2
// TODO: preload the title scene in another (parallel) job.
preloaderScene->AddJob([this]() { InitialiseRepositories(); });
preloaderScene->AddJob([this]() { InitialiseScriptEngine(); });
}
else
{
InitialiseRepositories();
InitialiseScriptEngine();
}
#ifdef ENABLE_SCRIPTING
_scriptEngine.Initialise();
#endif
_uiContext->Initialise();
return true;
}
@@ -574,6 +570,17 @@ namespace OpenRCT2
OpenProgress(STR_LOADING_GENERIC);
}
void InitialiseScriptEngine()
{
#ifdef ENABLE_SCRIPTING
OpenProgress(STR_LOADING_PLUGIN_ENGINE);
_scriptEngine.Initialise();
_uiContext->InitialiseScriptExtensions();
OpenProgress(STR_LOADING_GENERIC);
#endif
}
public:
void InitialiseDrawingEngine() final override
{
@@ -1349,7 +1356,10 @@ namespace OpenRCT2
ChatUpdate();
#ifdef ENABLE_SCRIPTING
_scriptEngine.Tick();
if (GetActiveScene() != GetPreloaderScene())
{
_scriptEngine.Tick();
}
#endif
_stdInOutConsole.ProcessEvalQueue();
_uiContext->Tick();