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

Apply code review suggestions

Browse Source
This commit is contained in:
Ted John
2020-08-26 01:56:50 +01:00
parent 76dded4e1e
commit 173a42f656
3 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1145,13 +1145,18 @@ void ScriptEngine::UpdateSockets()
{
# ifndef DISABLE_NETWORK
// Use simple for i loop as Update calls can modify the list
for (size_t i = 0; i < _sockets.size(); i++)
auto it = _sockets.begin();
while (it != _sockets.end())
{
_sockets[i]->Update();
if (_sockets[i]->IsDisposed())
auto& socket = *it;
socket->Update();
if (socket->IsDisposed())
{
_sockets.erase(_sockets.begin() + i);
i--;
it = _sockets.erase(it);
}
else
{
it++;
}
}
# endif
@@ -1160,18 +1165,10 @@ void ScriptEngine::UpdateSockets()
void ScriptEngine::RemoveSockets(const std::shared_ptr<Plugin>& plugin)
{
# ifndef DISABLE_NETWORK
for (auto it = _sockets.begin(); it != _sockets.end();)
{
if ((*it)->GetPlugin() == plugin)
{
(*it)->Dispose();
it = _sockets.erase(it);
}
else
{
it++;
}
}
_sockets.erase(
std::remove_if(
_sockets.begin(), _sockets.end(), [&plugin](const auto& socket) { return socket->GetPlugin() == plugin; }),
_sockets.end());
# endif
}