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

Hopefully fix event_handler

Browse Source
This commit is contained in:
Federico Cecchetto 2022-03-21 21:48:22 +01:00
parent b1c69e74b7
commit 40f277abfd
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,29 +33,31 @@ namespace scripting::lua
this->merge_callbacks(); this->merge_callbacks();
this->handle_endon_conditions(event); this->handle_endon_conditions(event);
for (auto i = 0; i < tasks.size();) for (auto i = tasks.begin(); i != tasks.end();)
{ {
const auto task = tasks[i]; if (i->is_deleted)
if (task.event != event.name || task.entity != event.entity) {
i = tasks.erase(i);
continue;
}
if (i->event != event.name || i->entity != event.entity)
{ {
++i; ++i;
continue; continue;
} }
if (!task.is_deleted) if (!has_built_arguments)
{ {
if (!has_built_arguments) has_built_arguments = true;
{ arguments = this->build_arguments(event);
has_built_arguments = true;
arguments = this->build_arguments(event);
}
handle_error(task.callback(sol::as_args(arguments)));
} }
if (task.is_volatile || task.is_deleted) handle_error(i->callback(sol::as_args(arguments)));
if (i->is_volatile || i->is_deleted)
{ {
tasks.erase(tasks.begin() + i); i = tasks.erase(i);
} }
else else
{ {

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

@ -44,7 +44,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::vector<event_listener>; using task_list = std::list<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_;