Changeset 8823 for code/branches

Timestamp:

Aug 4, 2011, 12:51:24 PM (13 years ago)

Author:

dafrick

Message:

Forgot to change some debug stuff.

Location:

code/branches/ai2

Files:

• data/levels/missionOne.oxw (modified) (2 diffs)
• src/modules/notifications/NotificationDispatcher.cc (modified) (2 diffs)
• src/modules/notifications/NotificationDispatcher.h (modified) (1 diff)

code/branches/ai2/data/levels/missionOne.oxw

@@ -105 +105 @@
     </SimpleNotification>
 
-    <SimpleNotification message="Right click on the next target." meh="true">
+    <SimpleNotification message="Right click on the next target." broadcast="true">
         <events>
             <trigger>
@@ -116 +116 @@
 <!-- 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>

code/branches/ai2/src/modules/notifications/NotificationDispatcher.cc

@@ -84 +84 @@
 
         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);
@@ -111 +111 @@
     void NotificationDispatcher::broadcast(void)
     {
-        COUT(0) << "meh" << endl;
         // TODO: Needed?
         const std::string message = this->createNotificationMessage();

code/branches/ai2/src/modules/notifications/NotificationDispatcher.h

@@ -50 +50 @@
         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.