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

Fix event_handler

Browse Source
This commit is contained in:
Federico Cecchetto 2022-03-18 22:11:08 +01:00
parent 22b14523b7
commit 80015c3839
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,15 +33,16 @@ namespace scripting::lua
this->merge_callbacks(); this->merge_callbacks();
this->handle_endon_conditions(event); this->handle_endon_conditions(event);
for (auto i = tasks.begin(); i != tasks.end();) 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; ++i;
continue; continue;
} }
if (!i->is_deleted) if (!task.is_deleted)
{ {
if (!has_built_arguments) if (!has_built_arguments)
{ {
@ -49,12 +50,12 @@ namespace scripting::lua
arguments = this->build_arguments(event); 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 else
{ {
@ -94,8 +95,8 @@ namespace scripting::lua
callbacks_.access([&](task_list& tasks) callbacks_.access([&](task_list& tasks)
{ {
merger(tasks); merger(tasks);
new_callbacks_.access(merger); new_callbacks_.access(merger);
}); });
} }