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

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/objects/quest

Files:

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

code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc

@@ -56 +56 @@
         RegisterRootObject(QuestManager);
 
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
     }
 
@@ -75 +77 @@
     /*static*/ QuestManager & QuestManager::getInstance()
     {
-        if(singletonRef_s == NULL)
-        {
-            singletonRef_s = new QuestManager();
-        }
+        assert(singletonRef_s);
         return *singletonRef_s;
     }

code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h

@@ -53 +53 @@
     class _OrxonoxExport QuestManager : public BaseObject
     {
-
-        protected:
+        public:
             QuestManager();
-
-        public:
             virtual ~QuestManager();