[Orxonox-commit 91] r2788 - in branches/questsystem5/src/orxonox: gamestates objects/quest overlays/notifications

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-03-15 15:17:20 +0000 (Sun, 15 Mar 2009)
New Revision: 2788

Modified:
   branches/questsystem5/src/orxonox/gamestates/GSLevel.cc
   branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc
   branches/questsystem5/src/orxonox/objects/quest/QuestManager.h
   branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc
   branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h
Log:
Some more changes...

Modified: branches/questsystem5/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/questsystem5/src/orxonox/gamestates/GSLevel.cc	2009-03-15 14:24:37 UTC (rev 2787)
+++ branches/questsystem5/src/orxonox/gamestates/GSLevel.cc	2009-03-15 15:17:20 UTC (rev 2788)
@@ -181,6 +181,18 @@
             this->playerManager_ = 0;
         }
 
+        if (this->questManager_)
+        {
+            delete this->questManager_;
+            this->questManager_ = NULL;
+        }
+
+        if (this->notificationManager_)
+        {
+            delete this->notificationManager_;
+            this->notificationManager_ = NULL;
+        }
+
         if (Core::showsGraphics())
         {
             inputState_->setHandler(0);

Modified: branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc
===================================================================
--- branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc	2009-03-15 14:24:37 UTC (rev 2787)
+++ branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc	2009-03-15 15:17:20 UTC (rev 2788)
@@ -51,7 +51,7 @@
     @todo
         Is inheriting from BaseObject proper?
     */
-    QuestManager::QuestManager() : BaseObject(this)
+    QuestManager::QuestManager()
     {
         RegisterRootObject(QuestManager);
 

Modified: branches/questsystem5/src/orxonox/objects/quest/QuestManager.h
===================================================================
--- branches/questsystem5/src/orxonox/objects/quest/QuestManager.h	2009-03-15 14:24:37 UTC (rev 2787)
+++ branches/questsystem5/src/orxonox/objects/quest/QuestManager.h	2009-03-15 15:17:20 UTC (rev 2788)
@@ -39,7 +39,7 @@
 #include <map>
 #include <string>
 
-#include "core/BaseObject.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
@@ -50,7 +50,7 @@
     @author
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport QuestManager : public BaseObject
+    class _OrxonoxExport QuestManager : public OrxonoxClass
     {
         public:
             QuestManager();

Modified: branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc
===================================================================
--- branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc	2009-03-15 14:24:37 UTC (rev 2787)
+++ branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc	2009-03-15 15:17:20 UTC (rev 2788)
@@ -53,7 +53,7 @@
     @brief
         Constructor. Registers the Object.
     */
-    NotificationManager::NotificationManager() : BaseObject(this)
+    NotificationManager::NotificationManager()
     {
         RegisterRootObject(NotificationManager);
 

Modified: branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h
===================================================================
--- branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h	2009-03-15 14:24:37 UTC (rev 2787)
+++ branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h	2009-03-15 15:17:20 UTC (rev 2788)
@@ -36,7 +36,7 @@
 
 #include "OrxonoxPrereqs.h"
 
-#include "core/BaseObject.h"
+#include "core/OrxonoxClass.h"
 
 #include <map>
 #include <string>
@@ -54,7 +54,7 @@
     @author
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport NotificationManager : public BaseObject
+    class _OrxonoxExport NotificationManager : public OrxonoxClass
     {
         public:
             NotificationManager();