Changeset 9879 in orxonox.OLD for trunk

Timestamp:

Oct 3, 2006, 4:16:33 PM (18 years ago)

Author:

bensch

Message:

runs somehow on Windows… but this needs millions of patches as i can see …

File:

• trunk/src/lib/event/event_handler.cc (modified) (5 diffs)

trunk/src/lib/event/event_handler.cc

@@ -257 +257 @@
 void EventHandler::unsubscribe(EventListener* el, elState state)
 {
-  assert( el != NULL && state < ES_NUMBER);
+  assert( el != NULL && state < ESTATE_NUMBER && state != ES_NULL);
   if( state == ES_ALL)
   {
-    for(unsigned int i = 0; i < ES_NUMBER; i++)
+    for(unsigned int i = 0; i < ESTATE_NUMBER; i++)
     {
       for(unsigned int j = 0; j < EV_NUMBER; j++)
@@ -302 +302 @@
   if( state == ES_ALL)
   {
-    for(int i = 0; i < ES_NUMBER; ++i)
+    for(int i = 0; i < ESTATE_NUMBER; ++i)
     {
       for(int j = 0; j < EV_NUMBER; ++j)
@@ -525 +525 @@
 const std::string& EventHandler::ELStateToString(elState state)
 {
-  if (state < ES_NUMBER)
+  if (state < ESTATE_NUMBER)
     return EventHandler::stateNames[state];
   else
@@ -537 +537 @@
 elState EventHandler::StringToELState(const std::string& stateName)
 {
-  for (unsigned int i = 0 ; i < ES_NUMBER; i++)
+  for (unsigned int i = 0 ; i < ESTATE_NUMBER; i++)
     if (stateName == EventHandler::stateNames[i])
       return (elState)i;
@@ -562 +562 @@
   PRINT(0)(" EventHandle Debug Information \n");
   PRINT(0)("===============================\n");
-  for(int i = 0; i < ES_NUMBER; ++i)
+  for(int i = 0; i < ESTATE_NUMBER; ++i)
   {
     for(int j = 0; j < EV_NUMBER; ++j)