[Orxonox-commit 2703] r7408 - in code/trunk/src/modules: notifications objects

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-09-11 15:09:48 +0200 (Sat, 11 Sep 2010)
New Revision: 7408

Modified:
   code/trunk/src/modules/notifications/NotificationDispatcher.cc
   code/trunk/src/modules/notifications/NotificationQueue.cc
   code/trunk/src/modules/objects/Script.cc
Log:
Did not get all xmlElements...


Modified: code/trunk/src/modules/notifications/NotificationDispatcher.cc
===================================================================
--- code/trunk/src/modules/notifications/NotificationDispatcher.cc	2010-09-11 12:52:59 UTC (rev 7407)
+++ code/trunk/src/modules/notifications/NotificationDispatcher.cc	2010-09-11 13:09:48 UTC (rev 7408)
@@ -104,6 +104,8 @@
         Is called when the NotificationDispatcher is triggered.
     @param triggered
         Whether it has been triggered or untriggered. The NotificationDispatcher only reacts to the first kind of events.
+    @param trigger
+        The object that caused the event to be fired.
     @return
         Returns true if the NotificationDispatcher was successfully triggered.
     */

Modified: code/trunk/src/modules/notifications/NotificationQueue.cc
===================================================================
--- code/trunk/src/modules/notifications/NotificationQueue.cc	2010-09-11 12:52:59 UTC (rev 7407)
+++ code/trunk/src/modules/notifications/NotificationQueue.cc	2010-09-11 13:09:48 UTC (rev 7408)
@@ -150,7 +150,7 @@
 
             std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator it = this->ordering_.begin();
             // Iterate through all elements whose creation time is smaller than the current time minus the display time.
-            while(it != this->ordering_.upper_bound(&this->timeLimit_))
+            while(it != this->ordering_.upper_bound(&this->timeLimit_) && it != this->ordering_.end())
             {
                 NotificationContainer* temp = *it;
                 it++;

Modified: code/trunk/src/modules/objects/Script.cc
===================================================================
--- code/trunk/src/modules/objects/Script.cc	2010-09-11 12:52:59 UTC (rev 7407)
+++ code/trunk/src/modules/objects/Script.cc	2010-09-11 13:09:48 UTC (rev 7408)
@@ -79,7 +79,7 @@
     */
     void Script::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(Script, XMLPort, xmlElement, mode);
+        SUPER(Script, XMLPort, xmlelement, mode);
 
         XMLPortParam(Script, "code", setCode, getCode, xmlelement, mode);
         XMLPortParamTemplate(Script, "mode", setMode, getMode, xmlelement, mode, const std::string&).defaultValues(Script::NORMAL);
@@ -102,7 +102,7 @@
     */
     void Script::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(Script, XMLEventPort, xmlElement, mode);
+        SUPER(Script, XMLEventPort, xmlelement, mode);
 
         XMLPortEventState(Script, BaseObject, "trigger", trigger, xmlelement, mode);
     }