Plug a memory leak in EventBus

[libs/game.git] / source / game / eventbus.h

diff --git a/source/game/eventbus.h b/source/game/eventbus.h
index 7da047ed1851b76b8bd79b6d903aa8b20c64b47e..b9e6c7890c77f5a56cb83f83cfd20c95c08a57c3 100644 (file)
--- a/source/game/eventbus.h
+++ b/source/game/eventbus.h
@@ -3,6 +3,7 @@
 
 #include <functional>
 #include <vector>
+#include <msp/core/noncopyable.h>
 
 namespace Msp::Game {
 
@@ -26,10 +27,11 @@ struct EventDispatcher
        { std::erase_if(handlers, [obs](auto &h){ return h.observer==obs; }); }
 
        void dispatch(const T &) const;
+       void dispatch_to(EventObserver &, const T &) const;
 };
 
 
-class EventBus
+class EventBus: public NonCopyable
 {
 private:
        using DeleteFunc = void(void *);
@@ -44,6 +46,10 @@ private:
 
        std::vector<Dispatcher> dispatchers;
 
+public:
+       ~EventBus();
+
+private:
        static unsigned get_next_id();
 
 public:
@@ -64,6 +70,9 @@ public:
 
        template<typename T>
        void dispatch(const T &) const;
+
+       template<typename T>
+       void dispatch_to(EventObserver &, const T &) const;
 };
 
 
@@ -74,6 +83,14 @@ void EventDispatcher<T>::dispatch(const T &event) const
                h.callback(event);
 }
 
+template<typename T>
+void EventDispatcher<T>::dispatch_to(EventObserver &obs, const T &event) const
+{
+       for(const Handler &h: handlers)
+               if(h.observer==&obs)
+                       h.callback(event);
+}
+
 
 template<typename T>
 inline unsigned EventBus::get_event_id()
@@ -108,6 +125,14 @@ inline void EventBus::dispatch(const T &event) const
                static_cast<EventDispatcher<T> *>(dispatchers[id].dispatcher)->dispatch(event);
 }
 
+template<typename T>
+inline void EventBus::dispatch_to(EventObserver &obs, const T &event) const
+{
+       unsigned id = get_event_id<T>();
+       if(id<dispatchers.size() && dispatchers[id].dispatcher)
+               static_cast<EventDispatcher<T> *>(dispatchers[id].dispatcher)->dispatch_to(obs, event);
+}
+
 } // namespace Msp::Game
 
 #endif