Changeset 5648 for code/branches/libraries/src/orxonox/overlays

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.

Location:

code/branches/libraries/src/orxonox/overlays

Files:

• CMakeLists.txt (modified) (1 diff)
• GUIOverlay.cc (modified) (2 diffs)
• OverlaysPrereqs.h (modified) (1 diff)
• notifications (deleted)

code/branches/libraries/src/orxonox/overlays/CMakeLists.txt

@@ -12 +12 @@
 ADD_SUBDIRECTORY(debug)
 ADD_SUBDIRECTORY(hud)
-ADD_SUBDIRECTORY(notifications)
 ADD_SUBDIRECTORY(stats)
 

code/branches/libraries/src/orxonox/overlays/GUIOverlay.cc

@@ -36 +36 @@
 #include "core/GUIManager.h"
 #include "core/XMLPort.h"
-#include "objects/quest/QuestManager.h"
 #include "objects/infos/PlayerInfo.h"
 
@@ -84 +83 @@
     {
         this->guiName_ = name;
-        QuestManager::getInstance().setPlayer(name, orxonox_cast<PlayerInfo*>(this->getOwner()));
+        GUIManager::getInstance().setPlayer(name, orxonox_cast<PlayerInfo*>(this->getOwner()));
     }
 }

code/branches/libraries/src/orxonox/overlays/OverlaysPrereqs.h

@@ -72 +72 @@
     class HUDHealthBar;
     class HUDTimer;
-    class Notification;
-    class NotificationListener;
-    class NotificationManager;
-    class NotificationOverlay;
-    class NotificationQueue;
     class OrxonoxOverlay;
     class OverlayGroup;