Changeset 1996 for code/branches/questsystem/src/orxonox/objects/Quest.cc

Timestamp:

Oct 22, 2008, 4:03:10 PM (16 years ago)

Author:

dafrick

Message:

Some cleaning, reorganization and implementation of some small methods.

File:

• code/branches/questsystem/src/orxonox/objects/Quest.cc (modified) (4 diffs)

code/branches/questsystem/src/orxonox/objects/Quest.cc

@@ -71 +71 @@
     /**
     @brief
+        Sets the parent quest of the quest.
+    @param quest
+        A pointer to the quest to be set as parent quest.
+    */
+    bool setParentQuest(Quest* quest)
+    {
+        this->parentQuest_ = quest;
+        return true;
+    }
+    
+    /**
+    @brief
+        Adds a sub quest to the quest.
+    @param quest
+        A pointer to the quest to be set as sub quest.
+    */
+    bool addSubQuest(Quest & quest)
+    {
+        this->subQuests_.push_back = quest;
+        return true;
+    }
+
+    /**
+    @brief
         Adds a Hint to the list of hints 
     @param hint
@@ -93 +117 @@
     @param player
         The player.
+    @return
+        Returns true if the quest could be started, false if not.
     */
-    void Quest::start(const Player & player)
+    bool Quest::start(const Player & player)
     {
-        if(this->isInactive(player))
+        if(this->isStartable(player))
         {
             this->setStatus(player, questStatus::active);
+            return true;
         }
-        else
-        {
-            COUT(2) << "A non-inactive quest was trying to be started." << std::endl;
-        }
+        COUT(2) << "A non-startable quest was trying to be started." << std::endl;
+        return false;
     }
     
@@ -111 +136 @@
     @param player
         The player.
+    @return
+        Returns true if the quest could be failed, false if not.
     */
     void Quest::fail(Player & player)
     {
-        if(this->isActive(player))
+        if(this->isFailable(player))
         {
             this->setStatus(player, questStatus::failed);
             QuestEffect::invokeEffects(player, this->failEffects_);
+            return true;
         }
-        else
-        {
-            COUT(2) << "A non-pending quest was trying to be failed." << std::endl;
-        }
+        COUT(2) << "A non-failable quest was trying to be failed." << std::endl;
+        return false;
     }
     
@@ -130 +156 @@
     @param player
         The player.
+    @return
+        Returns true if the quest could be completed, false if not.
     */
     void Quest::complete(Player & player)
     {
-        if(this->isActive(player))
+        if(this->isCompletable(player))
         {
             this->setStatus(player, questStatus::completed);
             QuestEffect::invokeEffects(player, this->completeEffects_);
+            return true;
         }
-        else
-        {
-            COUT(2) << "A non-pending quest was trying to be completed." << std::endl;
-        }
+        COUT(2) << "A non-completable quest was trying to be completed." << std::endl;
+        return false;
     }