Changeset 4420 in orxonox.OLD for orxonox/trunk/src/util/event

Timestamp:

May 31, 2005, 5:27:49 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: faster and easier unsubscribe function implemented

Location:

orxonox/trunk/src/util/event

Files:

• event_handler.cc (modified) (2 diffs)
• event_handler.h (modified) (1 diff)

orxonox/trunk/src/util/event/event_handler.cc

@@ -127 +127 @@
       for(int i = 0; i < ES_NUMBER; ++i)
         {
-          for(int j = 0; j < SDLK_LAST; ++j)
+          for(int j = 0; j < EV_NUMBER; ++j)
             {
               this->listeners[i][j] = NULL;
@@ -135 +135 @@
   else
     {
-      for(int j = 0; j < SDLK_LAST; ++j)
+      for(int j = 0; j < EV_NUMBER; ++j)
         {
           this->listeners[state][j] = NULL;
+        }
+    }
+}
+
+void EventHandler::unsubscribe(EventListener* el, elState state)
+{
+  if( state == ES_ALL)
+    {
+      for(int i = 0; i < ES_NUMBER; ++i)
+        {
+          for(int j = 0; j < EV_NUMBER; ++j)
+            {
+              if( this->listeners[i][j] == el )
+                this->listeners[i][j] = NULL;
+            }
+        }
+    }
+  else
+    {
+      for(int j = 0; j < EV_NUMBER; ++j)
+        {
+          if( this->listeners[state][j] == el )
+            this->listeners[state][j] = NULL;
         }
     }

orxonox/trunk/src/util/event/event_handler.h

@@ -28 +28 @@
   void subscribe(EventListener* el, elState state, int eventType);
   void unsubscribe(elState state, int eventType);
+  void unsubscribe(EventListener* el, elState state = ES_ALL);
+
   void flush(elState state);