Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Better fix

Browse Source
This commit is contained in:
Federico Cecchetto 2022-03-13 23:40:22 +01:00
parent e373f75fca
commit a406368471
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/client/game/scripting/lua/event_handler.cpp
View File

@ -31,28 +31,30 @@ namespace scripting::lua
this->merge_callbacks();
this->handle_endon_conditions(event);
for (auto i = tasks.begin(); i != tasks.end();)
auto size = tasks.size();
for (auto i = 0; i < tasks.size();)
{
if (i->event != event.name || i->entity != event.entity)
const auto task = tasks[i];
if (task.event != event.name || task.entity != event.entity)
{
++i;
continue;
}
if (!i->is_deleted)
if (!task.is_deleted)
{
if(!has_built_arguments)
if (!has_built_arguments)
{
has_built_arguments = true;
arguments = this->build_arguments(event);
}
handle_error(i->callback(sol::as_args(arguments)));
handle_error(task.callback(sol::as_args(arguments)));
}
if (i->is_volatile || i->is_deleted)
if (task.is_volatile || task.is_deleted)
{
i = tasks.erase(i);
tasks.erase(tasks.begin() + i);
}
else
{
@ -144,11 +146,11 @@ namespace scripting::lua
{
auto deleter = [&](task_list& tasks)
{
for(auto& task : tasks)
for (auto& task : tasks)
{
for(auto& condition : task.endon_conditions)
for (auto& condition : task.endon_conditions)
{
if(condition.first == event.entity && condition.second == event.name)
if (condition.first == event.entity && condition.second == event.name)
{
task.is_deleted = true;
break;

2
src/client/game/scripting/lua/event_handler.hpp
View File

@ -43,7 +43,7 @@ namespace scripting::lua
sol::state& state_;
std::atomic_int64_t current_listener_id_ = 0;
using task_list = std::list<event_listener>;
using task_list = std::vector<event_listener>;
utils::concurrency::container<task_list> new_callbacks_;
utils::concurrency::container<task_list, std::recursive_mutex> callbacks_;

10
src/client/game/scripting/lua/scheduler.cpp
View File

@ -23,11 +23,11 @@ namespace scripting::lua
{
auto deleter = [&](task_list& tasks)
{
for(auto& task : tasks)
for (auto& task : tasks)
{
for(auto& condition : task.endon_conditions)
for (auto& condition : task.endon_conditions)
{
if(condition.first == event.entity && condition.second == event.name)
if (condition.first == event.entity && condition.second == event.name)
{
task.is_deleted = true;
break;
@ -122,9 +122,9 @@ namespace scripting::lua
{
auto merger = [&](task_list& tasks)
{
for(auto& task : tasks)
for (auto& task : tasks)
{
if(task.id == handle.id)
if (task.id == handle.id)
{
task.endon_conditions.emplace_back(entity, event);
}