Changeset 5648 for code/branches/libraries/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Aug 14, 2009, 3:07:59 AM (15 years ago)

Author:

landauf

Message:

sorry, large commit, but all changes are dependent:

• Created a new plugin for the questsystem (called just "quest" for the moment because I'd had to rename the directory otherwise (the tolua script enforces this))
• Added QuestPrereqs.h file and _QuestExport macro
• Moved the GUI-name ↔ PlayerInfo map from QuestManager to GUIManager
• Moved NotificationOverlay and NotificationQueue from overlays to quest and linked the overlays plugin into the quest plugin
• Made QuestManager and NotificationManager ScopedSingletons with ScopeID GSLevel. Also removed both singletons from GSLevel and added the Scope instance instead.

File:

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

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

@@ -47 +47 @@
 #include "tools/interfaces/Tickable.h"
 #include "objects/Radar.h"
-#include "objects/quest/QuestManager.h"
-#include "objects/quest/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;
         }