Changeset 4873 in orxonox.OLD for orxonox

Timestamp:

Jul 15, 2005, 12:37:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: temporary fix in the EvenetHandler
EVENT_NUMBER is not a maximum value of events, but merely a count of how many differnent kinds of events there are
FIXME

Location:

orxonox/trunk/src/lib

Files:

• event/event_def.h (modified) (2 diffs)
• event/event_handler.cc (modified) (4 diffs)
• lang/class_list.cc (modified) (2 diffs)

orxonox/trunk/src/lib/event/event_def.h

@@ -1 +1 @@
 /*!
-    \file event_def.h
-  *  some central definitions
+ * @file event_def.h
+ * some central definitions
 
 */
@@ -34 +34 @@
   EV_UNKNOWN,
 
-  EV_NUMBER,
+  EV_NUMBER = 500,  //!< FIXME MSUT Resolve this EV_NUMBER should hold all the Events, also the count of other events
 };
 

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

@@ -24 +24 @@
 #include "compiler.h"
 #include "debug.h"
+#include "class_list.h"
 
 using namespace std;
@@ -42 +43 @@
   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;
@@ -277 +278 @@
       PRINT(4)("=  Got Event nr %i, for state %i", ev.type, this->state);
 
+      //! @todo fix this debug code away */
+      ////////////////////////////////////////////////////////////////
       listener = this->listeners[this->state][ev.type];
+      if (!ClassList::exists(listener, CL_EVENT_LISTENER) && listener != NULL)
+      {
+        ClassList::debug(3, CL_EVENT_LISTENER);
+        this->debug();
+        printf("ERROR THIS EVENT DOES NOT EXIST\n");
+        return;
+      }
+      ////////////////////////////////////////////////////////////////
       if( listener != NULL)
         {
@@ -304 +315 @@
       if( this->listeners[i][j] != NULL)
       {
-        PRINT(0)("Event %d of State %d subscribed to %s\n", j, i, this->listeners[i][j]->getName());
+        PRINT(0)("Event %d of State %d subscribed to %s (%p)\n", j, i, this->listeners[i][j]->getName(), this->listeners[i][j]);
       }
     }

orxonox/trunk/src/lib/lang/class_list.cc

@@ -211 +211 @@
  * @param classID the class that should be displayed (if CL_NULL (default) all classes will be displayed)
  */
-    void ClassList::debug(unsigned int debugLevel, long classID)
+void ClassList::debug(unsigned int debugLevel, long classID)
 {
   if (debugLevel > 3)
@@ -244 +244 @@
         while (enumBO)
         {
-          PRINT(0)("|   (class %s): NAME(%s)->%p\n", enumBO->getClassName(), enumBO->getName(), enumBO);
+          PRINT(0)("|   (class %s): NAME(%s)->%p ", enumBO->getClassName(), enumBO->getName(), enumBO);
           if (debugLevel == 3)
             enumBO->whatIs();
+          else
+          {
+            PRINT(0)("\n");
+          }
           enumBO = iterator->nextElement();
         }