Changeset 2205 for code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc

Timestamp:

Nov 13, 2008, 9:55:01 PM (17 years ago)

Author:

dafrick

Message:

Changed from ControllableEntity to PlayerInfo…

File:

• code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc (modified) (11 diffs)

code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc

@@ -36 +36 @@
 #include "GlobalQuest.h"
 
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/infos/PlayerInfo.h"
 #include "core/CoreIncludes.h"
 #include "util/Exception.h"
@@ -86 +86 @@
         Returns true if the Quest could be failed, false if not.
     */
-    bool GlobalQuest::fail(ControllableEntity* player)
+    bool GlobalQuest::fail(PlayerInfo* player)
     {
         if(this->isFailable(player)) //!< Check whether the Quest can be failed.
@@ -93 +93 @@
             
             //! Iterate through all players possessing this Quest.
-            for(std::set<ControllableEntity*>::const_iterator it = players_.begin(); it != players_.end(); it++)
+            for(std::set<PlayerInfo*>::const_iterator it = players_.begin(); it != players_.end(); it++)
             {
                 QuestEffect::invokeEffects(*it, this->getFailEffectList());
@@ -115 +115 @@
         Returns true if the Quest could be completed, false if not.
     */
-    bool GlobalQuest::complete(ControllableEntity* player)
+    bool GlobalQuest::complete(PlayerInfo* player)
     {
         if(this->isCompletable(player)) //!< Check whether the Quest can be completed.
@@ -122 +122 @@
             
             //! Iterate through all players possessing the Quest.
-            for(std::set<ControllableEntity*>::const_iterator it = players_.begin(); it != players_.end(); it++)
+            for(std::set<PlayerInfo*>::const_iterator it = players_.begin(); it != players_.end(); it++)
             {
                 QuestEffect::invokeEffects(*it, this->getCompleteEffectList());
@@ -145 +145 @@
         Throws an exception if either isInactive() of isActive() throws one.
     */
-    bool GlobalQuest::isStartable(const ControllableEntity* player) const
+    bool GlobalQuest::isStartable(const PlayerInfo* player) const
     {
         return this->isInactive(player) ||  this->isActive(player);
@@ -160 +160 @@
         Throws an Exception if isActive() throws one.
     */
-    bool GlobalQuest::isFailable(const ControllableEntity* player) const
+    bool GlobalQuest::isFailable(const PlayerInfo* player) const
     {
         return this->isActive(player);
@@ -176 +176 @@
         Throws an Exception if isActive() throws one.
     */
-    bool GlobalQuest::isCompletable(const ControllableEntity* player) const
+    bool GlobalQuest::isCompletable(const PlayerInfo* player) const
     {
         return this->isActive(player);
@@ -189 +189 @@
         Throws an Exception if player is NULL.
     */
-    questStatus::Enum GlobalQuest::getStatus(const ControllableEntity* player) const
+    questStatus::Enum GlobalQuest::getStatus(const PlayerInfo* player) const
     {
         if(player == NULL) //!< We don't want NULL-Pointers!
         {
-            ThrowException(Argument, "The input ControllableEntity* is NULL.");
+            ThrowException(Argument, "The input PlayerInfo* is NULL.");
         }
 
         //! Find the player.
-        std::set<ControllableEntity*>::const_iterator it = this->players_.find((ControllableEntity*)(void*)player);
+        std::set<PlayerInfo*>::const_iterator it = this->players_.find((PlayerInfo*)(void*)player);
         if (it != this->players_.end()) //!< If the player was found.
         {
@@ -217 +217 @@
         Returns false if player is NULL.
     */
-    bool GlobalQuest::setStatus(ControllableEntity* player, const questStatus::Enum & status)
+    bool GlobalQuest::setStatus(PlayerInfo* player, const questStatus::Enum & status)
     {
         if(player == NULL) //!< We don't want NULL-Pointers!
@@ -225 +225 @@
 
         //! Find the player.
-        std::set<ControllableEntity*>::const_iterator it = this->players_.find(player);
+        std::set<PlayerInfo*>::const_iterator it = this->players_.find(player);
         if (it == this->players_.end()) //!< Player is not yet in the list.
         {