eventsystem again

Author: Caladius

src/port/hooks/impl/EventSystem.cpp

@@ -9,17 +9,22 @@ EventID EventSystem::RegisterEvent() {
 }
 
 ListenerID EventSystem::RegisterListener(EventID id, EventCallback callback, EventPriority priority) {
+    if (id == -1) {
         throw std::runtime_error("Trying to register listener for unregistered event");
     }
 
     auto& listeners = this->mEventListeners[id];
 
+    if (std::find_if(listeners.begin(), listeners.end(),
+                     [callback](EventListener listener) { return listener.function == callback; }) != listeners.end()) {
         throw std::runtime_error("Listener already registered");
     }
 
     listeners.push_back({ priority, callback });
 
     // Sort by priority
+    std::sort(listeners.begin(), listeners.end(),
+              [](EventListener a, EventListener b) { return a.priority < b.priority; });
 
     return listeners.size() - 1;
 }
@@ -42,9 +47,11 @@ extern "C" EventID EventSystem_RegisterEvent() {
     return EventSystem::Instance->RegisterEvent();
 }
 
+extern "C" ListenerID EventSystem_RegisterListener(EventID id, EventCallback callback, EventPriority priority) {
     return EventSystem::Instance->RegisterListener(id, callback, priority);
 }
 
+extern "C" void EventSystem_UnregisterListener(EventID ev, ListenerID id) {
     EventSystem::Instance->UnregisterListener(ev, id);
 }