Changeset 2788

Timestamp:

Mar 15, 2009, 4:17:20 PM (16 years ago)

Author:

dafrick

Message:

Some more changes…

Location:

code/branches/questsystem5/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• objects/quest/QuestManager.cc (modified) (1 diff)
• objects/quest/QuestManager.h (modified) (2 diffs)
• overlays/notifications/NotificationManager.cc (modified) (1 diff)
• overlays/notifications/NotificationManager.h (modified) (2 diffs)

code/branches/questsystem5/src/orxonox/gamestates/GSLevel.cc

@@ -180 +180 @@
             delete this->playerManager_;
             this->playerManager_ = 0;
+        }
+
+        if (this->questManager_)
+        {
+            delete this->questManager_;
+            this->questManager_ = NULL;
+        }
+
+        if (this->notificationManager_)
+        {
+            delete this->notificationManager_;
+            this->notificationManager_ = NULL;
         }
 

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

@@ -52 +52 @@
         Is inheriting from BaseObject proper?
     */
-    QuestManager::QuestManager() : BaseObject(this)
+    QuestManager::QuestManager()
     {
         RegisterRootObject(QuestManager);

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

@@ -40 +40 @@
 #include <string>
 
-#include "core/BaseObject.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -51 +51 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport QuestManager : public BaseObject
+    class _OrxonoxExport QuestManager : public OrxonoxClass
     {
         public:

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

@@ -54 +54 @@
         Constructor. Registers the Object.
     */
-    NotificationManager::NotificationManager() : BaseObject(this)
+    NotificationManager::NotificationManager()
     {
         RegisterRootObject(NotificationManager);

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

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/BaseObject.h"
+#include "core/OrxonoxClass.h"
 
 #include <map>
@@ -55 +55 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport NotificationManager : public BaseObject
+    class _OrxonoxExport NotificationManager : public OrxonoxClass
     {
         public: