Changeset 5648 for code/branches/libraries/src/orxonox/objects/quest/QuestManager.h

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/objects/quest/QuestManager.h (modified) (7 diffs)

code/branches/libraries/src/orxonox/objects/quest/QuestManager.h

@@ -35 +35 @@
 #define _QuestManager_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/quest/QuestPrereqs.h"
 
 #include <list>
@@ -41 +41 @@
 #include <string>
 
-#include "util/Singleton.h"
+#include "util/ScopedSingleton.h"
 #include "core/OrxonoxClass.h"
 
@@ -66 +66 @@
     };
 
+    typedef ScopedSingleton<QuestManager, ScopeID::GSLevel> ScopedSingletonQuestManagerGSLevel; // workaround for tolua
+
     /**
     @brief
@@ -73 +75 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport QuestManager : public Singleton<QuestManager>, public orxonox::OrxonoxClass
+    class _QuestExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass
     {
 // tolua_end
-            friend class Singleton<QuestManager>;
+            friend class ScopedSingleton<QuestManager, ScopeID::GSLevel>;
         public:
             QuestManager();
@@ -82 +84 @@
 
             //! Returns a reference to the single instance of the Quest Manager.
-            static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export
+            static QuestManager& getInstance() { return ScopedSingleton<QuestManager, ScopeID::GSLevel>::getInstance(); } // tolua_export
 
             bool registerQuest(Quest* quest); //!< Registers a Quest in the QuestManager.
@@ -92 +94 @@
             QuestContainer* getQuestTree(std::string & name); // tolua_export
 
-            inline void setPlayer(const std::string& guiname, PlayerInfo* player)
-                { this->players_[guiname] = player; }
-            inline PlayerInfo* getPlayer(const std::string& guiname) const
-                { std::map<std::string, PlayerInfo*>::const_iterator it = this->players_.find(guiname); return (it != this->players_.end()) ? it->second : 0; }
-
         private:
             static QuestManager* singletonPtr_s;
@@ -102 +99 @@
             std::map<std::string, Quest*> questMap_; //!< All Quests registered by their id's.
             std::map<std::string, QuestHint*> hintMap_; //!< All QuestHints registered by their id's.
-            std::map<std::string, PlayerInfo*> players_; //!< Stores the player (owner) for each gui
 
             void getRootQuests(const PlayerInfo* player, std::list<Quest*> & list);