Changeset 5291 in orxonox.OLD for trunk/src/lib

Timestamp:

Oct 7, 2005, 12:00:46 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor bug-fixes in the Event_listener.
still have to find the 'even-level'-bug

Location:

trunk/src/lib/event

Files:

• event_def.h (modified) (1 diff)
• event_handler.cc (modified) (7 diffs)
• event_listener.h (modified) (1 diff)

trunk/src/lib/event/event_def.h

@@ -47 +47 @@
     ES_ALL,            //!< you want to register events for all states
 
-    ES_NUMBER,          //!< the number of states
+    ES_NUMBER,         //!< the number of states
   };
 

trunk/src/lib/event/event_handler.cc

@@ -43 +43 @@
 
   /* now initialize them all to zero */
-  for(int i = 0; i < ES_NUMBER; i++)
-    {
-      for(int j = 0; j < EV_NUMBER; j++)
-        {
-          this->listeners[i][j] = NULL;
-        }
-    }
+  this->flush(ES_ALL);
+
   this->state = ES_GAME;
   this->keyMapper = NULL;
@@ -105 +100 @@
    than one state, you have to subscribe for each state again. If you want to subscribe for all states, use
    state = ES_ALL, which will subscribe your listener for all states together.
- *
- * @todo this can also be done with the & operator, and checking for states, just set the esState to 1,2,4,8, and then 15 is equal to ES_ALL
-*/
+ */
 void EventHandler::subscribe(EventListener* el, elState state, int eventType)
 {
@@ -113 +106 @@
   if( state == ES_ALL )
     {
-      for(int i = 0; i < ES_NUMBER; ++i)
-        if( likely(this->listeners[state][eventType] == NULL))
+      for(unsigned int i = 0; i < ES_NUMBER; i++)
+        if( likely(this->listeners[i][eventType] == NULL))
           this->listeners[i][eventType] = el;
         else
@@ -140 +133 @@
 {
   PRINTF(4)("Unsubscribing event type nr: %i\n", eventType);
-  this->listeners[state][eventType] = NULL;
+  if (state == ES_ALL)
+    for (unsigned int i = 0; i < ES_NUMBER; i++)
+      this->listeners[i][eventType] = NULL;
+  else
+    this->listeners[state][eventType] = NULL;
 }
 
@@ -152 +149 @@
 void EventHandler::unsubscribe(EventListener* el, elState state)
 {
-  if( el == NULL)
+  if( el == NULL || state >= ES_NUMBER)
     return;
   if( state == ES_ALL)
     {
-      for(int i = 0; i < ES_NUMBER; ++i)
-        {
-          for(int j = 0; j < EV_NUMBER; ++j)
+      for(unsigned int i = 0; i < ES_NUMBER; i++)
+        {
+          for(unsigned int j = 0; j < EV_NUMBER; j++)
             {
               if( this->listeners[i][j] == el )
@@ -167 +164 @@
   else
     {
-      for(int j = 0; j < EV_NUMBER; ++j)
+      for(int j = 0; j < EV_NUMBER; j++)
         {
           if( this->listeners[state][j] == el )
@@ -319 +316 @@
   PRINT(0)("===============================\n");
   for(int i = 0; i < ES_NUMBER; ++i)
-  {
     for(int j = 0; j < EV_NUMBER; ++j)
-    {
       if( this->listeners[i][j] != NULL)
-      {
         PRINT(0)("Event %d of State %d subscribed to %s (%p)\n", j, i, this->listeners[i][j]->getName(), this->listeners[i][j]);
-      }
-    }
-  }
   PRINT(0)("============================EH=\n");
 }

trunk/src/lib/event/event_listener.h

@@ -18 +18 @@
 
   /**
-   *  abstract function that processes events from the handler
+   * abstract function that processes events from the handler
    * @param event: the event
-  */
+   */
   virtual void process(const Event &event) = 0;
 };