izzy/OpenRCT2-Unity
0
0
Fork 0
mirror of https://github.com/izzy2lost/OpenRCT2-Unity.git synced 2026-03-10 12:38:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use shared_ptr for Plugin

Browse Source
This commit is contained in:
Ted John
2018-03-23 22:39:12 +00:00
parent a6bb9a9b64
commit f54b3efe9e
7 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,11 +80,11 @@ void ScriptEngine::LoadPlugins()
auto path = std::string(scanner->GetPath());
try
{
Plugin p(_context, path);
_execInfo.SetCurrentPlugin(&p);
p.Load();
p.EnableHotReload();
_plugins.push_back(std::move(p));
auto plugin = std::make_shared<Plugin>(_context, path);
_execInfo.SetCurrentPlugin(plugin);
plugin->Load();
plugin->EnableHotReload();
_plugins.push_back(std::move(plugin));
}
catch (const std::exception &e)
{
@@ -98,14 +98,14 @@ void ScriptEngine::AutoReloadPlugins()
{
for (auto& plugin : _plugins)
{
if (plugin.ShouldHotReload())
if (plugin->ShouldHotReload())
{
try
{
_hookEngine.UnsubscribeAll(plugin);
_execInfo.SetCurrentPlugin(&plugin);
plugin.Load();
plugin.Start();
_execInfo.SetCurrentPlugin(plugin);
plugin->Load();
plugin->Start();
}
catch (const std::exception &e)
{
@@ -120,10 +120,10 @@ void ScriptEngine::StartPlugins()
{
for (auto& plugin : _plugins)
{
_execInfo.SetCurrentPlugin(&plugin);
_execInfo.SetCurrentPlugin(plugin);
try
{
plugin.Start();
plugin->Start();
}
catch (const std::exception &e)
{