Changeset 6944 for code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc

Timestamp:

May 20, 2010, 9:43:45 PM (14 years ago)

Author:

dafrick

Message:

No more seg-faults when restarting a game, quests still not working properly the second thime, though.
Also replaced QuestListener mode 'receive' with 'start' in quest_test, which appears to be the correct term.

File:

• code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc (modified) (5 diffs)

code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc

@@ -56 +56 @@
     NotificationQueue::NotificationQueue(BaseObject* creator) : OverlayGroup(creator)
     {
+        this->registered_ = false;
+        
         RegisterObject(NotificationQueue);
         this->initialize();
@@ -68 +70 @@
         this->targets_.clear();
         this->clear();
+
+        if(this->registered_)
+            NotificationManager::getInstance().unregisterListener(this);
     }
 
@@ -81 +86 @@
 
         NotificationManager::getInstance().registerListener(this);
+        this->registered_ = true;
     }
 
@@ -423 +429 @@
             return false;
 
+        NotificationManager::getInstance().unregisterNotification(container->notification, this);
+        
         this->removeElement(container->overlay);
         this->containers_.erase(container);
@@ -443 +451 @@
         {
             this->removeContainer(*it);
-            it = this->containers_.begin(); //TODO: Needed?
+            it = this->containers_.begin();
         }
     }