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

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

@ -31,15 +31,17 @@ 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();) 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; ++i;
continue; continue;
} }
if (!i->is_deleted) if (!task.is_deleted)
{ {
if (!has_built_arguments) if (!has_built_arguments)
{ {
@ -47,12 +49,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
{ {

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

@ -43,7 +43,7 @@ namespace scripting::lua
sol::state& state_; sol::state& state_;
std::atomic_int64_t current_listener_id_ = 0; 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> new_callbacks_;
utils::concurrency::container<task_list, std::recursive_mutex> callbacks_; utils::concurrency::container<task_list, std::recursive_mutex> callbacks_;