Changeset 2910 for code/trunk/src/orxonox/objects

Timestamp:

Apr 8, 2009, 1:36:05 AM (16 years ago)

Author:

landauf

Message:

reverted r2909 because there were some unwanted files included

Location:

code/trunk/src/orxonox/objects/quest

Files:

• AddQuest.cc (modified) (3 diffs)
• AddQuest.h (modified) (1 diff)
• AddQuestHint.cc (modified) (2 diffs)
• AddQuestHint.h (modified) (1 diff)
• AddReward.cc (modified) (1 diff)
• AddReward.h (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• ChangeQuestStatus.cc (modified) (1 diff)
• ChangeQuestStatus.h (modified) (1 diff)
• CompleteQuest.cc (modified) (2 diffs)
• CompleteQuest.h (modified) (1 diff)
• FailQuest.cc (modified) (2 diffs)
• FailQuest.h (modified) (1 diff)
• GlobalQuest.cc (modified) (1 diff)
• GlobalQuest.h (modified) (1 diff)
• LocalQuest.cc (modified) (1 diff)
• LocalQuest.h (modified) (1 diff)
• Quest.cc (modified) (2 diffs)
• Quest.h (modified) (1 diff)
• QuestDescription.cc (modified) (5 diffs)
• QuestDescription.h (modified) (1 diff)
• QuestEffect.cc (modified) (1 diff)
• QuestEffect.h (modified) (1 diff)
• QuestEffectBeacon.cc (modified) (1 diff)
• QuestEffectBeacon.h (modified) (1 diff)
• QuestHint.cc (modified) (2 diffs)
• QuestHint.h (modified) (1 diff)
• QuestItem.cc (modified) (1 diff)
• QuestItem.h (modified) (1 diff)
• QuestListener.cc (modified) (2 diffs)
• QuestListener.h (modified) (1 diff)
• QuestManager.cc (modified) (11 diffs)
• QuestManager.h (modified) (3 diffs)
• QuestNotification.cc (deleted)
• QuestNotification.h (deleted)
• Rewardable.cc (modified) (1 diff)
• Rewardable.h (modified) (1 diff)

code/trunk/src/orxonox/objects/quest/AddQuest.cc

@@ -28 +28 @@
 
 /**
-    @file AddQuest.cc
+    @file
     @brief Implementation of the AddQuest class.
 */
@@ -42 +42 @@
 #include "orxonox/objects/infos/PlayerInfo.h"
 #include "QuestManager.h"
-#include "QuestDescription.h"
 #include "Quest.h"
 
@@ -97 +96 @@
         try
         {
-            Quest* quest = QuestManager::getInstance().findQuest(this->getQuestId());
+            Quest* quest = QuestManager::findQuest(this->getQuestId());
             if(quest == NULL || !quest->start(player))
             {

code/trunk/src/orxonox/objects/quest/AddQuest.h

@@ -28 +28 @@
 
 /**
-    @file AddQuest.h
+    @file
     @brief Definition of the AddQuest class.
 */

code/trunk/src/orxonox/objects/quest/AddQuestHint.cc

@@ -28 +28 @@
 
 /**
-    @file AddQuestHint.cc
+    @file
     @brief Implementation of the AddQuestHint class.
 */
@@ -117 +117 @@
         try
         {
-            QuestHint* hint = QuestManager::getInstance().findHint(this->hintId_);
+            QuestHint* hint = QuestManager::findHint(this->hintId_);
             if(hint == NULL || !hint->setActive(player))
             {

code/trunk/src/orxonox/objects/quest/AddQuestHint.h

@@ -28 +28 @@
 
 /**
-    @file AddQuestHint.h
+    @file
     @brief Definition of the AddQuestHint class.
 */

code/trunk/src/orxonox/objects/quest/AddReward.cc

@@ -28 +28 @@
 
 /**
-    @file AddReward.cc
+    @file
     @brief Implementation of the AddReward class.
 */

code/trunk/src/orxonox/objects/quest/AddReward.h

@@ -28 +28 @@
 
 /**
-    @file AddReward.h
+    @file
     @brief Definition of the AddReward class.
 */

code/trunk/src/orxonox/objects/quest/CMakeLists.txt

@@ -16 +16 @@
   QuestListener.cc
   QuestManager.cc
-  QuestNotification.cc
   Rewardable.cc
 )

code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.cc

@@ -28 +28 @@
 
 /**
-    @file ChangeQuestStatus.cc
+    @file
     @brief Implementation of the ChangeQuestStatus class.
 */

code/trunk/src/orxonox/objects/quest/ChangeQuestStatus.h

@@ -28 +28 @@
 
 /**
-    @file ChangeQuestStatus.h
+    @file
     @brief Definition of the ChangeQuestStatus class.
 */

code/trunk/src/orxonox/objects/quest/CompleteQuest.cc

@@ -28 +28 @@
  
 /**
-    @file CompleteQuest.cc
+    @file
     @brief Implementation of the CompleteQuest class.
 */
@@ -96 +96 @@
         try
         {
-            quest = QuestManager::getInstance().findQuest(this->getQuestId());
+            quest = QuestManager::findQuest(this->getQuestId());
             if(quest == NULL || !quest->complete(player))
             {

code/trunk/src/orxonox/objects/quest/CompleteQuest.h

@@ -28 +28 @@
 
 /**
-    @file CompleteQuest.h
+    @file
     @brief Definition of the CompleteQuest class.
 */

code/trunk/src/orxonox/objects/quest/FailQuest.cc

@@ -28 +28 @@
  
 /**
-    @file FailQuest.cc
+    @file
     @brief Implementation of the FailQuest class.
 */
@@ -95 +95 @@
         try
         {
-            quest = QuestManager::getInstance().findQuest(this->getQuestId());
+            quest = QuestManager::findQuest(this->getQuestId());
             if(quest == NULL || !quest->fail(player))
             {

code/trunk/src/orxonox/objects/quest/FailQuest.h

@@ -28 +28 @@
 
 /**
-    @file FailQuest.h
+    @file
     @brief Definition of the FailQuest class.
 */

code/trunk/src/orxonox/objects/quest/GlobalQuest.cc

@@ -28 +28 @@
  
 /**
-    @file GlobalQuest.cc
+    @file
     @brief Implementation of the GlobalQuest class.
 */

code/trunk/src/orxonox/objects/quest/GlobalQuest.h

@@ -28 +28 @@
  
 /**
-    @file GlobalQuest.h
+    @file
     @brief Definition of the GlobalQuest class.
 */

code/trunk/src/orxonox/objects/quest/LocalQuest.cc

@@ -28 +28 @@
 
 /**
-    @file LocalQuest.cc
+    @file
     @brief Implementation of the LocalQuest class.
 */

code/trunk/src/orxonox/objects/quest/LocalQuest.h

@@ -28 +28 @@
  
 /**
-    @file LocalQuest.h
+    @file
     @brief Definition of the LocalQuest class.
 */

code/trunk/src/orxonox/objects/quest/Quest.cc

@@ -28 +28 @@
  
 /**
-    @file Quest.cc
+    @file
     @brief Implementation of the Quest class.
 */
@@ -79 +79 @@
         XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
 
-        QuestManager::getInstance().registerQuest(this); //!<Registers the Quest with the QuestManager.
+        QuestManager::registerQuest(this); //!<Registers the Quest with the QuestManager.
     }
 

code/trunk/src/orxonox/objects/quest/Quest.h

@@ -28 +28 @@
  
 /**
-    @file Quest.h
+    @file
     @brief Definition of the Quest class.
         The Quest is the parent class of LocalQuest and GlobalQuest.

code/trunk/src/orxonox/objects/quest/QuestDescription.cc

@@ -28 +28 @@
 
 /**
-    @file QuestDescription.cc
+    @file
     @brief Implementation of the QuestDescription class.
 */
@@ -37 +37 @@
 
 #include "core/CoreIncludes.h"
-#include "QuestNotification.h"
+#include "orxonox/overlays/notifications/Notification.h"
 
 namespace orxonox
@@ -89 +89 @@
     @return
         Returns true if successful.
-    @todo
-        Make sure the messages meet the conditions.
     */
     bool QuestDescription::notificationHelper(const std::string & item, const std::string & status) const
     {
         std::string message = "";
+        std::string title = "";
         if(item == "hint")
         {
-            message = "You received a hint: '" + this->title_ + "'";
+            title = "You received a hint: '" + this->title_ + "'";
+            message = this->description_;
         }
         else if(item == "quest")
@@ -103 +103 @@
             if(status == "start")
             {
-                message = "You received a new quest: '" + this->title_ + "'";
+                title = "You received a new quest: '" + this->title_ + "'";
+                message = this->description_;
             }
             else if(status == "fail")
             {
-                message = "You failed the quest: '" + this->title_ + "'";
+                title = "You failed the quest: '" + this->title_ + "'";
+                message = this->failMessage_;
             }
             else if(status == "complete")
             {
-                message = "You successfully completed the quest: '" + this->title_ + "'";
+                title = "You successfully completed the quest: '" + this->title_ + "'";
+                message = this->completeMessage_;
             }
             else
@@ -125 +128 @@
         }
         
-        QuestNotification* notification = new QuestNotification(message);
+        Notification* notification = new Notification(0, message, title, 30);
         notification->send();
         return true;

code/trunk/src/orxonox/objects/quest/QuestDescription.h

@@ -28 +28 @@
 
 /**
-    @file QuestDescription.h
+    @file
     @brief Definition of the QuestDescription class.
 */

code/trunk/src/orxonox/objects/quest/QuestEffect.cc

@@ -28 +28 @@
 
 /**
-    @file QuestEffect.cc
+    @file
     @brief Implementation of the QuestEffect class.
 */

code/trunk/src/orxonox/objects/quest/QuestEffect.h

@@ -28 +28 @@
  
 /**
-    @file QuestEffect.h
+    @file
     @brief Definition of the QuestEffect class.
 */

code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.cc

@@ -28 +28 @@
 
 /**
-    @file QuestEffectBeacon.cc
+    @file
     @brief Implementation of the QuestEffectBeacon class.
 */

code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.h

@@ -28 +28 @@
 
 /**
-    @file QuestEffectBeacon.h
+    @file
     @brief Definition of the QuestEffectBeacon class.
 */

code/trunk/src/orxonox/objects/quest/QuestHint.cc

@@ -28 +28 @@
  
 /**
-    @file QuestHint.cc
+    @file
     @brief Implementation of the QuestHint class.
 */
@@ -73 +73 @@
         SUPER(QuestHint, XMLPort, xmlelement, mode);
 
-        QuestManager::getInstance().registerHint(this); //!< Registers the QuestHint with the QuestManager.
+        QuestManager::registerHint(this); //!< Registers the QuestHint with the QuestManager.
         
         COUT(3) << "New QuestHint {" << this->getId() << "} created." << std::endl;

code/trunk/src/orxonox/objects/quest/QuestHint.h

@@ -28 +28 @@
  
 /**
-    @file QuestHint.h
+    @file
     @brief Definition of the QuestHint class.
 */

code/trunk/src/orxonox/objects/quest/QuestItem.cc

@@ -28 +28 @@
  
 /**
-    @file QuestItem.cc
+    @file
     @brief Implementation of the QuestItem class.
 */

code/trunk/src/orxonox/objects/quest/QuestItem.h

@@ -28 +28 @@
  
 /**
-    @file QuestItem.h
+    @file
     @brief Definition of the QuestItem class.
         The QuestItem is the parent class of Quest and QuestHint.

code/trunk/src/orxonox/objects/quest/QuestListener.cc

@@ -28 +28 @@
 
 /**
-    @file QuestListener.cc
+    @file
     @brief Implementation of the QuestListener class.
 */
@@ -112 +112 @@
     bool QuestListener::setQuestId(const std::string & id)
     {
-        this->quest_ = QuestManager::getInstance().findQuest(id); //!< Find the Quest corresponding to the given questId.
+        this->quest_ = QuestManager::findQuest(id); //!< Find the Quest corresponding to the given questId.
         
         if(this->quest_ == NULL) //!< If there is no such Quest.

code/trunk/src/orxonox/objects/quest/QuestListener.h

@@ -28 +28 @@
 
 /**
-    @file QuestListener.h
+    @file
     @brief Definition of the QuestListener class.
 */

code/trunk/src/orxonox/objects/quest/QuestManager.cc

@@ -28 +28 @@
 
 /**
-    @file QuestManager.cc
+    @file
     @brief Implementation of the QuestManager class.
 */
@@ -43 +43 @@
 namespace orxonox
 {
-    //! Pointer to the current (and single) instance of this class.
-    QuestManager* QuestManager::singletonRef_s = NULL;
+    //! All Quests registered by their id's.
+    std::map<std::string, Quest*> QuestManager::questMap_s;
+    //! All QuestHints registered by their id's.
+    std::map<std::string, QuestHint*> QuestManager::hintMap_s;
 
     /**
     @brief
         Constructor. Registers the object.
-    @todo
-        Is inheriting from BaseObject proper?
-    */
-    QuestManager::QuestManager()
-    {
-        RegisterRootObject(QuestManager);
-
-        assert(singletonRef_s == 0);
-        singletonRef_s = this;
+    */
+    QuestManager::QuestManager(BaseObject* creator) : BaseObject(creator)
+    {
+        RegisterObject(QuestManager);
     }
 
@@ -67 +64 @@
     {
 
-    }
-
-    /**
-    @brief
-        Returns a reference to the current (and single) instance of the QuestManager, and creates one if there isn't one to begin with.
-    @return
-        Returns a reference to the single instance of the Quest Manager.
-    */
-    /*static*/ QuestManager & QuestManager::getInstance()
-    {
-        assert(singletonRef_s);
-        return *singletonRef_s;
     }
 
@@ -90 +75 @@
         Returns true if successful, false if not.
     */
-    bool QuestManager::registerQuest(Quest* quest)
+    /*static*/ bool QuestManager::registerQuest(Quest* quest)
     {
         if(quest == NULL) //!< Doh! Just as if there were actual quests behind NULL-pointers.
@@ -99 +84 @@
 
         std::pair<std::map<std::string, Quest*>::iterator,bool> result;
-        result = this->questMap_.insert( std::pair<std::string,Quest*>(quest->getId(),quest) ); //!< Inserting the Quest.
+        result = questMap_s.insert( std::pair<std::string,Quest*>(quest->getId(),quest) ); //!< Inserting the Quest.
 
         if(result.second) //!< If inserting was a success.
@@ -122 +107 @@
         Returns true if successful, false if not.
     */
-    bool QuestManager::registerHint(QuestHint* hint)
+    /*static*/ bool QuestManager::registerHint(QuestHint* hint)
     {
         if(hint == NULL) //!< Still not liking NULL-pointers.
@@ -131 +116 @@
 
         std::pair<std::map<std::string, QuestHint*>::iterator,bool> result;
-        result = this->hintMap_.insert ( std::pair<std::string,QuestHint*>(hint->getId(),hint) ); //!< Inserting the QuestHSint.
+        result = hintMap_s.insert ( std::pair<std::string,QuestHint*>(hint->getId(),hint) ); //!< Inserting the QuestHSint.
 
         if(result.second) //!< If inserting was a success.
@@ -156 +141 @@
         Throws an exception if the given questId is invalid.
     */
-    Quest* QuestManager::findQuest(const std::string & questId)
+    /*static*/ Quest* QuestManager::findQuest(const std::string & questId)
     {
         if(!QuestItem::isId(questId)) //!< Check vor validity of the given id.
@@ -164 +149 @@
 
         Quest* quest;
-        std::map<std::string, Quest*>::iterator it = this->questMap_.find(questId);
-        if (it != this->questMap_.end()) //!< If the Quest is registered.
+        std::map<std::string, Quest*>::iterator it = questMap_s.find(questId);
+        if (it != questMap_s.end()) //!< If the Quest is registered.
         {
             quest = it->second;
@@ -190 +175 @@
         Throws an exception if the given hintId is invalid.
     */
-    QuestHint* QuestManager::findHint(const std::string & hintId)
+    /*static*/ QuestHint* QuestManager::findHint(const std::string & hintId)
     {
         if(!QuestItem::isId(hintId)) //!< Check vor validity of the given id.
@@ -198 +183 @@
 
         QuestHint* hint;
-        std::map<std::string, QuestHint*>::iterator it = this->hintMap_.find(hintId);
-        if (it != this->hintMap_.end()) //!< If the QuestHint is registered.
+        std::map<std::string, QuestHint*>::iterator it = hintMap_s.find(hintId);
+        if (it != hintMap_s.end()) //!< If the QuestHint is registered.
         {
             hint = it->second;

code/trunk/src/orxonox/objects/quest/QuestManager.h

@@ -28 +28 @@
 
 /**
-    @file QuestManager.h
+    @file
     @brief Definition of the QuestManager class.
 */
@@ -40 +40 @@
 #include <string>
 
-#include "core/OrxonoxClass.h"
+#include "core/BaseObject.h"
 
 namespace orxonox
@@ -46 +46 @@
     /**
     @brief
-        Is a Singleton and manages Quests, by registering every Quest/QuestHint (through registerX()) and making them globally accessable (through findX()).
+        Is a static class and manages Quests, by registering every Quest/QuestHint (through registerX()) and making them globally accessable (through findX()).
         Quests (and QuestHints) are registered in the QuestManager with their id, and can be accessed in the same way.
     @author
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport QuestManager : public OrxonoxClass
+    class _OrxonoxExport QuestManager : public BaseObject
     {
+
         public:
-            QuestManager();
+            QuestManager(BaseObject* creator);
             virtual ~QuestManager();
 
-            static QuestManager& getInstance(); //!< Returns a reference to the single instance of the Quest Manager.
+            static bool registerQuest(Quest* quest); //!< Registers a Quest in the QuestManager.
+            static bool registerHint(QuestHint* quest); //!< Registers a QuestHint in the QuestManager.
 
-            bool registerQuest(Quest* quest); //!< Registers a Quest in the QuestManager.
-            bool registerHint(QuestHint* quest); //!< Registers a QuestHint in the QuestManager.
-
-            Quest* findQuest(const std::string & questId); //!< Returns the Quest with the input id.
-            QuestHint* findHint(const std::string & hintId); //!< Returns the QuestHint with the input id.
+            static Quest* findQuest(const std::string & questId); //!< Returns the Quest with the input id.
+            static QuestHint* findHint(const std::string & hintId); //!< Returns the QuestHint with the input id.
 
         private:
-            static QuestManager* singletonRef_s;
-
-            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.
+            static std::map<std::string, Quest*> questMap_s; //!< All Quests registered by their id's.
+            static std::map<std::string, QuestHint*> hintMap_s; //!< All QuestHints registered by their id's.
 
     };

code/trunk/src/orxonox/objects/quest/Rewardable.cc

@@ -28 +28 @@
 
 /**
-    @file Rewardable.cc
+    @file
     @brief Implementation of the Rewardable class.
 */

code/trunk/src/orxonox/objects/quest/Rewardable.h

@@ -28 +28 @@
 
 /**
-    @file Rewardable.h
+    @file
     @brief Definition of the Rewardable class.
 */