[Orxonox-commit 4152] r8823 - in code/branches/ai2: data/levels src/modules/notifications

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-08-04 12:51:24 +0200 (Thu, 04 Aug 2011)
New Revision: 8823

Modified:
   code/branches/ai2/data/levels/missionOne.oxw
   code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc
   code/branches/ai2/src/modules/notifications/NotificationDispatcher.h
Log:
Forgot to change some debug stuff. ;)


Modified: code/branches/ai2/data/levels/missionOne.oxw
===================================================================
--- code/branches/ai2/data/levels/missionOne.oxw	2011-08-03 22:45:06 UTC (rev 8822)
+++ code/branches/ai2/data/levels/missionOne.oxw	2011-08-04 10:51:24 UTC (rev 8823)
@@ -104,7 +104,7 @@
         </events>
     </SimpleNotification>
 
-    <SimpleNotification message="Right click on the next target." meh="true">
+    <SimpleNotification message="Right click on the next target." broadcast="true">
         <events>
             <trigger>
                 <EventListener event=PawnDied1 />
@@ -115,7 +115,7 @@
 
 <!-- BRIEFING END--> 
 <!-- TODO: does NOT work. Intended effect: pawn death causes message to appear (and probably the next box) -->
-  <SimpleNotification message="Right click on the next target." meh="true">
+  <SimpleNotification message="Right click on the next target." broadcast="true">
         <events>
             <trigger>
                 <Pawn health=30 position="0,0,0" direction="0,-1,0" collisionType=dynamic mass=100000>

Modified: code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc
===================================================================
--- code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc	2011-08-03 22:45:06 UTC (rev 8822)
+++ code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc	2011-08-04 10:51:24 UTC (rev 8823)
@@ -83,7 +83,7 @@
         SUPER(NotificationDispatcher, XMLPort, xmlelement, mode);
 
         XMLPortParam(NotificationDispatcher, "sender", setSender, getSender, xmlelement, mode);
-        XMLPortParam(NotificationDispatcher, "meh", setBroadcasting, isBroadcasting, xmlelement, mode);
+        XMLPortParam(NotificationDispatcher, "broadcast", setBroadcasting, isBroadcasting, xmlelement, mode);
 
         XMLPortEventSink(NotificationDispatcher, BaseObject, "trigger", trigger, xmlelement, mode);
     }
@@ -110,7 +110,6 @@
     */
     void NotificationDispatcher::broadcast(void)
     {
-        COUT(0) << "meh" << endl;
         // TODO: Needed?
         const std::string message = this->createNotificationMessage();
         NotificationListener::sendNotification(message, this->getSender(), notificationMessageType::info, notificationSendMode::local);

Modified: code/branches/ai2/src/modules/notifications/NotificationDispatcher.h
===================================================================
--- code/branches/ai2/src/modules/notifications/NotificationDispatcher.h	2011-08-03 22:45:06 UTC (rev 8822)
+++ code/branches/ai2/src/modules/notifications/NotificationDispatcher.h	2011-08-04 10:51:24 UTC (rev 8823)
@@ -49,7 +49,7 @@
     @brief
         A NotificationDispatcher is an entity that, upon being triggered, dispatches (or sends) a specified @ref orxonox::Notification "Notification".
 
-        There ate two parameter to be set:
+        There are two parameter to be set:
         - The @b sender . The sender specifies the part of Orxonox the sent @ref orxonox::Notification "Notification" comes from. The default value is set by the classes implementing NotificationDispatcher.
         - The @b broadcast . Specifies whether messages are broadcast (i.e. sent to all clients) or just sent to a specific player.