Changeset 7868 in orxonox.OLD for trunk/src/lib/event/event_handler.cc

Timestamp:

May 26, 2006, 1:21:32 PM (18 years ago)

Author:

bensch

Message:

trunk: merge Check in the Event-changes:
r7867 | bensch | 2006-05-26 13:19:46 +0200 (Fri, 26 May 2006) | 1 line

Events better subscribed

---

r7866 | bensch | 2006-05-26 13:11:10 +0200 (Fri, 26 May 2006) | 1 line

Events are subscribed at the EventListener, and not the EventHandler

File:

• trunk/src/lib/event/event_handler.cc (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -171 +171 @@
    unsubscribe(EventListener* el, elState state) function
 */
-void EventHandler::unsubscribe(elState state, int eventType)
+void EventHandler::unsubscribe(EventListener* el, elState state, int eventType)
 {
   PRINTF(4)("Unsubscribing event type nr: %i\n", eventType);
   if (state == ES_ALL)
     for (unsigned int i = 0; i < ES_NUMBER; i++)
-      this->listeners[i][eventType].clear();
-  else
-    this->listeners[state][eventType].clear();
-}
-
-
-/**
- * unsubscribe all events from a specific listener
+    {
+      std::vector<EventListener*>::iterator listener =
+         std::find(this->listeners[i][eventType].begin(),
+                   this->listeners[i][eventType].end(),
+                   el);
+      if (listener != this->listeners[i][eventType].end())
+        this->listeners[i][eventType].erase(listener);
+    }
+  else
+  {
+    std::vector<EventListener*>::iterator listener =
+        std::find(this->listeners[state][eventType].begin(),
+                  this->listeners[state][eventType].end(),
+                  el);
+    if (listener != this->listeners[state][eventType].end())
+      this->listeners[state][eventType].erase(listener);
+  }
+}
+
+
+/**
+ * @brief unsubscribe all events from a specific listener
  * @param el: the listener that wants to unsubscribe itself
  * @param state: the state in which the events shall be unsubscribed
-
-*/
+ */
 void EventHandler::unsubscribe(EventListener* el, elState state)
 {