Changeset 2205 for code/branches/questsystem2/src/orxonox/objects/quest/QuestHint.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/QuestHint.cc (modified) (3 diffs)

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

@@ -39 +39 @@
 #include "util/Exception.h"
 
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/infos/PlayerInfo.h"
 #include "Quest.h"
 
@@ -86 +86 @@
         Returns true if the QuestHint is active for the specified player.
     */
-    bool QuestHint::isActive(ControllableEntity* player)
+    bool QuestHint::isActive(const PlayerInfo* player) const
     {
         if(player == NULL) //!< NULL-Pointers are ugly!
         {
-            ThrowException(Argument, "The input ControllableEntity* is NULL.");
+            ThrowException(Argument, "The input PlayerInfo* is NULL.");
             return false;
         }
 
         //! Find the player.
-        std::map<ControllableEntity*, questHintStatus::Enum>::iterator it = this->playerStatus_.find(player);
+        std::map<const PlayerInfo*, questHintStatus::Enum>::const_iterator it = this->playerStatus_.find(player);
         if (it != this->playerStatus_.end()) //!< If the player is in the map.
         {
@@ -112 +112 @@
         Returns true if the activation was successful, false if there were problems.
     */
-    bool QuestHint::setActive(ControllableEntity* player)
+    bool QuestHint::setActive(PlayerInfo* player)
     {
         if(this->quest_->isActive(player)) //!< For a hint to get activated the quest must be active.