Index: code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc
===================================================================
--- code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc	(revision 2159)
+++ code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc	(revision 2191)
@@ -79,18 +79,18 @@
     /**
     @brief
-        Fails the quest for all players.
-        Invokes the failEffects on all the players possessing this quest.
+        Fails the Quest for all players.
+        Invokes the fail QuestEffects on all the players possessing this Quest.
     @param player
         The player failing it.
     @return
-        Returns true if the quest could be failed, false if not.
+        Returns true if the Quest could be failed, false if not.
     */
     bool GlobalQuest::fail(ControllableEntity* player)
     {
-        if(this->isFailable(player)) //!< Check whether the quest can be failed.
+        if(this->isFailable(player)) //!< Check whether the Quest can be failed.
         {
             this->setStatus(player, questStatus::failed);
             
-            //! Iterate through all players possessing this quest.
+            //! Iterate through all players possessing this Quest.
             for(std::set<ControllableEntity*>::const_iterator it = players_.begin(); it != players_.end(); it++)
             {
@@ -107,19 +107,19 @@
     /**
     @brief
-        Completes the quest for all players.
-        Invokes the completeEffects on all the players possessing this quest.
-        Invokes the reward effects on the player completing the quest.
+        Completes the Quest for all players.
+        Invokes the complete QuestEffects on all the players possessing this Quest.
+        Invokes the reward QuestEffects on the player completing the Quest.
     @param player
         The player completing it.
     @return
-        Returns true if the quest could be completed, false if not.
+        Returns true if the Quest could be completed, false if not.
     */
     bool GlobalQuest::complete(ControllableEntity* player)
     {
-        if(this->isCompletable(player)) //!< Check whether the quest can be completed.
+        if(this->isCompletable(player)) //!< Check whether the Quest can be completed.
         {
             this->setStatus(player, questStatus::completed);
             
-            //! Iterate through all players possessing the quest.
+            //! Iterate through all players possessing the Quest.
             for(std::set<ControllableEntity*>::const_iterator it = players_.begin(); it != players_.end(); it++)
             {
@@ -127,5 +127,5 @@
             }
             
-            QuestEffect::invokeEffects(player, this->rewards_); //!< Invoke reward effects on the player completing the quest.
+            QuestEffect::invokeEffects(player, this->rewards_); //!< Invoke reward QuestEffects on the player completing the Quest.
             return true;
         }
@@ -137,5 +137,5 @@
     /**
     @brief
-        Checks whether the quest can be started.
+        Checks whether the Quest can be started.
     @param player
         The player for whom is to be checked.
@@ -152,9 +152,9 @@
     /**
     @brief
-        Checks whether the quest can be failed.
+        Checks whether the Quest can be failed.
     @param player
         The player for whom is to be checked.
     @return
-        Returns true if the quest can be failed, false if not.
+        Returns true if the Quest can be failed, false if not.
     @throws
         Throws an Exception if isActive() throws one.
@@ -168,9 +168,9 @@
     /**
     @brief
-        Checks whether the quest can be completed.
+        Checks whether the Quest can be completed.
     @param player
         The player for whom is to be checked.
     @return
-        Returns true if the quest can be completed, false if not.
+        Returns true if the Quest can be completed, false if not.
     @throws
         Throws an Exception if isActive() throws one.
@@ -183,5 +183,5 @@
     /**
     @brief
-        Returns the status of the quest for a specific player.
+        Returns the status of the Quest for a specific player.
     @param player
         The player.
@@ -237,7 +237,7 @@
     /**
     @brief
-        Adds a reward effect to the list of reward effects.
+        Adds a reward QuestEffect to the list of reward QuestEffects.
     @param effect
-        The effect to be added.
+        The QuestEffect to be added.
     @return
         Returns true if successful.
@@ -251,5 +251,5 @@
         }
 
-        this->rewards_.push_back(effect); //!< Add the effect to the list.
+        this->rewards_.push_back(effect); //!< Add the QuestEffect to the list.
 
         COUT(3) << "Reward effect was added to Quest {" << this->getId() << "}." << std::endl;
@@ -259,5 +259,5 @@
     /**
     @brief
-        Returns the reward effect at the given index.
+        Returns the reward QuestEffect at the given index.
     @param index
         The index.
