server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-08-23 15:28:34 +08:00
parent bfde769e98
commit 17166c21d3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/trigger.cc
View File

@ -22,7 +22,7 @@
class EventHandler : public std::enable_shared_from_this<EventHandler> class EventHandler : public std::enable_shared_from_this<EventHandler>
{ {
public: public:
a8::CommonCbProc cb; std::shared_ptr<a8::CommonCbProc> cb;
list_head entry; list_head entry;
std::shared_ptr<EventHandler> holder; std::shared_ptr<EventHandler> holder;
@ -497,7 +497,8 @@ std::weak_ptr<EventHandler> Trigger::AddListener(int event_id, a8::CommonCbProc
INIT_LIST_HEAD(&itr->second); INIT_LIST_HEAD(&itr->second);
} }
auto p = std::make_shared<EventHandler>(); auto p = std::make_shared<EventHandler>();
p->cb = cb; p->cb = std::make_shared<a8::CommonCbProc>();
*p->cb = cb;
list_add_tail(&p->entry, &itr->second); list_add_tail(&p->entry, &itr->second);
p->holder = p; p->holder = p;
return p; return p;
@ -529,7 +530,8 @@ void Trigger::DispatchEvent(int event_id, const std::vector<std::any>& param)
if (itr != listeners_hash_.end()) { if (itr != listeners_hash_.end()) {
struct EventHandler *handle = nullptr, *tmp = nullptr; struct EventHandler *handle = nullptr, *tmp = nullptr;
list_for_each_entry_safe(handle, tmp, &itr->second, entry) { list_for_each_entry_safe(handle, tmp, &itr->second, entry) {
handle->cb(param); auto cb = handle->cb;
(*cb)(param);
} }
} }
} }