Changeset 2287 for code/branches/questsystem3/src/orxonox

Timestamp:

Nov 26, 2008, 7:17:08 PM (16 years ago)

Author:

dafrick

Message:

Fixed a stupid bug…

Location:

code/branches/questsystem3/src/orxonox/overlays/notifications

Files:

• NotificationManager.cc (modified) (1 diff)
• NotificationQueue.cc (modified) (4 diffs)
• NotificationQueue.h (modified) (1 diff)

code/branches/questsystem3/src/orxonox/overlays/notifications/NotificationManager.cc

@@ -104 +104 @@
                 continue;
             
+            COUT(3) << "Update, title: " << container->notification->getTitle() << ", message: " << container->notification->getMessage() << std::endl;
+            
             text = text + "\n\n\n------------" + container->notification->getTitle(); + "\n\n" + container->notification->getMessage();
         }

code/branches/questsystem3/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -37 +37 @@
 namespace orxonox {
 
-    NotificationQueue* NotificationQueue::queue_s;
+    NotificationQueue* NotificationQueue::queue_s = 0;
     
     CreateFactory(NotificationQueue);
@@ -70 +70 @@
     {
         NotificationManager::tick(dt);
+        
+        update();
     }
     
@@ -84 +86 @@
     void NotificationQueue::setQueueText(const std::string & text)
     {
-        COUT(3) << text << std::endl;
         this->queueText_ = text;
     }
@@ -90 +91 @@
     void NotificationQueue::update(void)
     {
-        //TDO UTF string
         this->text_->setCaption(queueText_);
     }

code/branches/questsystem3/src/orxonox/overlays/notifications/NotificationQueue.h

@@ -52 +52 @@
             virtual ~NotificationQueue();
             
-            static NotificationQueue* queue_s;
+            static NotificationQueue* queue_s; //TDO Singleton? oder im level.
             
             virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);