mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-18 13:32:32 +01:00
Code Issues Releases Wiki Activity

Revert change to RemoveCustomGameActions

Browse Source
This commit is contained in:
Ted John
2020-04-24 13:38:27 +01:00
parent 4162ad0eb6
commit 4ebd8da630
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -821,8 +821,17 @@ bool ScriptEngine::RegisterCustomAction(
void ScriptEngine::RemoveCustomGameActions(const std::shared_ptr<Plugin>& plugin) void ScriptEngine::RemoveCustomGameActions(const std::shared_ptr<Plugin>& plugin)
{ {
auto isOwner = [&] (auto& obj) { return obj.second.Owner == plugin; } for (auto it = _customActions.begin(); it != _customActions.end();)
std::erase(std::remove_if(_customActions.begin(), _customActions.end(), isOwner), _customActions.end()); {
if (it->second.Owner == plugin)
{
it = _customActions.erase(it);
}
else
{
it++;
}
}
} }
void ScriptEngine::RunGameActionHooks(const GameAction& action, std::unique_ptr<GameActionResult>& result, bool isExecute) void ScriptEngine::RunGameActionHooks(const GameAction& action, std::unique_ptr<GameActionResult>& result, bool isExecute)