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

Refactor plugin scope

Browse Source
This commit is contained in:
Ted John
2018-03-23 23:24:36 +00:00
parent f54b3efe9e
commit d445cfc125
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/scripting/ScriptEngine.cpp
View File

@@ -81,7 +81,7 @@ void ScriptEngine::LoadPlugins()
try
{
auto plugin = std::make_shared<Plugin>(_context, path);
_execInfo.SetCurrentPlugin(plugin);
ScriptExecutionInfo::PluginScope scope(_execInfo, plugin);
plugin->Load();
plugin->EnableHotReload();
_plugins.push_back(std::move(plugin));
@@ -91,7 +91,6 @@ void ScriptEngine::LoadPlugins()
_console.WriteLineError(e.what());
}
}
_execInfo.SetCurrentPlugin(nullptr);
}
void ScriptEngine::AutoReloadPlugins()
@@ -103,7 +102,8 @@ void ScriptEngine::AutoReloadPlugins()
try
{
_hookEngine.UnsubscribeAll(plugin);
_execInfo.SetCurrentPlugin(plugin);
ScriptExecutionInfo::PluginScope scope(_execInfo, plugin);
plugin->Load();
plugin->Start();
}
@@ -113,14 +113,13 @@ void ScriptEngine::AutoReloadPlugins()
}
}
}
_execInfo.SetCurrentPlugin(nullptr);
}
void ScriptEngine::StartPlugins()
{
for (auto& plugin : _plugins)
{
_execInfo.SetCurrentPlugin(plugin);
ScriptExecutionInfo::PluginScope scope(_execInfo, plugin);
try
{
plugin->Start();
@@ -130,7 +129,6 @@ void ScriptEngine::StartPlugins()
_console.WriteLineError(e.what());
}
}
_execInfo.SetCurrentPlugin(nullptr);
}
void ScriptEngine::Update()