Changeset 2909 for code/trunk/src/orxonox/gamestates

Timestamp:

Apr 8, 2009, 1:07:27 AM (16 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…

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSGUI.cc (added)
• GSGUI.h (added)
• GSLevel.cc (modified) (3 diffs)
• GSLevel.h (modified) (1 diff)

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;
         }
 

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

@@ -67 +67 @@
         LevelManager*         levelManager_;            //!< global level manager
         PlayerManager*        playerManager_;           //!< player manager for this level
+        QuestManager*         questManager_;            //!< quest manager for this level
+        NotificationManager*  notificationManager_;     //!< notification manager for this level
 
         //##### ConfigValues #####