X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgame%2Feventbus.h;h=7da047ed1851b76b8bd79b6d903aa8b20c64b47e;hb=db01a6ed506ea2352b20f10b2694e249d2bba6c5;hp=ce9c812e20b1593cbbe6489b537d4ad201f1f52f;hpb=6a93721ab67315e916f6c649b1f7bc5447d611a4;p=libs%2Fgame.git

diff --git a/source/game/eventbus.h b/source/game/eventbus.h
index ce9c812..7da047e 100644
--- a/source/game/eventbus.h
+++ b/source/game/eventbus.h
@@ -23,7 +23,7 @@ struct EventDispatcher
 	{ handlers.emplace_back(obs, std::move(cb)); }
 
 	void remove_observer(EventObserver *obs)
-	{ std::erase_if(handlers, [obs](const Handler &h){ return h.observer==obs; }); }
+	{ std::erase_if(handlers, [obs](auto &h){ return h.observer==obs; }); }
 
 	void dispatch(const T &) const;
 };
@@ -52,12 +52,12 @@ public:
 
 private:
 	template<typename T>
-	EventDispatcher<T> &get_emitter();
+	EventDispatcher<T> &get_dispatcher();
 
 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_dispatcher<T>().add_observer(&obs, std::move(cb)); }
 
 	void replace_observer(EventObserver &, EventObserver &);
 	void remove_observer(EventObserver &);
@@ -83,7 +83,7 @@ inline unsigned EventBus::get_event_id()
 }
 
 template<typename T>
-inline EventDispatcher<T> &EventBus::get_emitter()
+inline EventDispatcher<T> &EventBus::get_dispatcher()
 {
 	unsigned id = get_event_id<T>();
 	if(dispatchers.size()<=id)
@@ -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>