[Orxonox-commit 1172] r5893 - in code/branches/core5/src: libraries/core modules/pong

[landauf at orxonox.net]

Author: landauf
Date: 2009-10-06 13:55:05 +0200 (Tue, 06 Oct 2009)
New Revision: 5893

Modified:
   code/branches/core5/src/libraries/core/EventIncludes.h
   code/branches/core5/src/modules/pong/Pong.cc
Log:
Removed ambiguity between the EventName macro and the EventName class. The macro is now called FireEventName. (It did work before, but wasn't very nice ofc)

Modified: code/branches/core5/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/core5/src/libraries/core/EventIncludes.h	2009-10-06 07:18:40 UTC (rev 5892)
+++ code/branches/core5/src/libraries/core/EventIncludes.h	2009-10-06 11:55:05 UTC (rev 5893)
@@ -81,7 +81,7 @@
 /**
     @brief This macro is needed to fire an event with this name. The event name must previously be declared with @ref CreateEventName.
 */    
-#define EventName(classname, name) \
+#define FireEventName(classname, name) \
     eventname##classname##name
  
 #endif /* _EventIncludes_H__ */

Modified: code/branches/core5/src/modules/pong/Pong.cc
===================================================================
--- code/branches/core5/src/modules/pong/Pong.cc	2009-10-06 07:18:40 UTC (rev 5892)
+++ code/branches/core5/src/modules/pong/Pong.cc	2009-10-06 11:55:05 UTC (rev 5893)
@@ -159,9 +159,9 @@
         if (this->center_)
         {
             if (player == this->getRightPlayer())
-                this->center_->fireEvent(EventName(PongCenterpoint, right));
+                this->center_->fireEvent(FireEventName(PongCenterpoint, right));
             else if (player == this->getLeftPlayer())
-                this->center_->fireEvent(EventName(PongCenterpoint, left));
+                this->center_->fireEvent(FireEventName(PongCenterpoint, left));
             
             if (player)
                 this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");