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

Timestamp:

Aug 29, 2009, 10:19:38 PM (15 years ago)

Author:

landauf

Message:

merged libraries branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

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

@@ -45 +45 @@
 #include "core/XMLFile.h"
 
-#include "interfaces/Tickable.h"
+#include "tools/interfaces/Tickable.h"
 #include "objects/Radar.h"
-#include "objects/quest/QuestManager.h"
-#include "overlays/notifications/NotificationManager.h"
 #include "CameraManager.h"
 #include "LevelManager.h"
@@ -110 +108 @@
         this->playerManager_ = new PlayerManager();
 
-        this->questManager_ = new QuestManager();
-
-        this->notificationManager_ = new NotificationManager();
+        this->scope_GSLevel_ = new Scope<ScopeID::GSLevel>();
 
         if (GameMode::isMaster())
@@ -201 +197 @@
         }
 
-        if (this->questManager_)
-        {
-            delete this->questManager_;
-            this->questManager_ = NULL;
-        }
-
-        if (this->notificationManager_)
-        {
-            delete this->notificationManager_;
-            this->notificationManager_ = NULL;
+        if (this->scope_GSLevel_)
+        {
+            delete this->scope_GSLevel_;
+            this->scope_GSLevel_ = NULL;
         }