Changeset 2786 for code/branches/questsystem5/src/orxonox/overlays

Timestamp:

Mar 15, 2009, 12:55:45 PM (16 years ago)

Author:

dafrick

Message:

Some changes to QuestManager and NotificationManager by Reto's request. (Make them more consistent as Singletons)

Location:

code/branches/questsystem5/src/orxonox/overlays/notifications

Files:

• NotificationManager.cc (modified) (2 diffs)
• NotificationManager.h (modified) (1 diff)

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

@@ -58 +58 @@
         RegisterRootObject(NotificationManager);
 
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
+
         this->highestIndex_ = 0;
     }
@@ -77 +80 @@
     /*static*/ NotificationManager & NotificationManager::getInstance()
     {
-        if(singletonRef_s == NULL)
-        {
-            singletonRef_s = new NotificationManager();
-        }
+        assert(singletonRef_s);
         return *singletonRef_s;
     }

code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h

@@ -57 +57 @@
     class _OrxonoxExport NotificationManager : public BaseObject
     {
-        protected:
+        public:
             NotificationManager();
-
-        public:
             virtual ~NotificationManager();