Fix some pointer/reference mismatches in EventBus

diff --git a/source/game/eventbus.h b/source/game/eventbus.h
index ce9c812e20b1593cbbe6489b537d4ad201f1f52f..e09663589c8c99fe02180db76b94fbe6506af54b 100644 (file)
--- a/source/game/eventbus.h
+++ b/source/game/eventbus.h
@@ -57,7 +57,7 @@ private:
 public:
        template<typename T>
        void add_observer(EventObserver &obs, std::function<void(const T &)> cb)
-       { get_emitter<T>().add_observer(obs, std::move(cb)); }
+       { get_emitter<T>().add_observer(&obs, std::move(cb)); }
 
        void replace_observer(EventObserver &, EventObserver &);
        void remove_observer(EventObserver &);
@@ -94,10 +94,10 @@ inline EventDispatcher<T> &EventBus::get_emitter()
        {
                event.dispatcher = new EventDispatcher<T>;
                event.deleter = [](void *p){ delete static_cast<EventDispatcher<T> *>(p); };
-               event.remover = [](void *p, EventObserver &o){ static_cast<EventDispatcher<T> *>(p)->remove_observer(o); };
+               event.remover = [](void *p, EventObserver &o){ static_cast<EventDispatcher<T> *>(p)->remove_observer(&o); };
        }
 
-       return static_cast<EventDispatcher<T> *>(event.dispatcher);
+       return *static_cast<EventDispatcher<T> *>(event.dispatcher);
 }
 
 template<typename T>