Changeset 2909 for code/trunk/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Apr 8, 2009, 1:07:27 AM (15 years ago)

Author:

dafrick

Message:

Merging the QuestSystem branch to the trunk. Let's hope, this isn't a 'third time's the charm'-thing…

File:

• code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -50 +50 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
+#include "orxonox/objects/quest/QuestManager.h"
+#include "orxonox/overlays/notifications/NotificationManager.h"
 #include "gui/GUIManager.h"
 
@@ -110 +112 @@
 
         this->playerManager_ = new PlayerManager();
+
+        this->questManager_ = new QuestManager();
+
+        this->notificationManager_ = new NotificationManager();
 
         if (GameMode::isMaster())
@@ -203 +209 @@
             delete this->playerManager_;
             this->playerManager_ = 0;
+        }
+
+        if (this->questManager_)
+        {
+            delete this->questManager_;
+            this->questManager_ = NULL;
+        }
+
+        if (this->notificationManager_)
+        {
+            delete this->notificationManager_;
+            this->notificationManager_ = NULL;
         }