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

Timestamp:

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

Author:

dafrick

Message:

Changed from ControllableEntity to PlayerInfo…

File:

• code/branches/questsystem2/src/orxonox/objects/quest/Quest.cc (modified) (6 diffs)

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

@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/infos/PlayerInfo.h"
 #include "QuestManager.h"
 #include "QuestDescription.h"
@@ -313 +313 @@
         Throws an exception if getStatus throws one.
     */
-    bool Quest::isInactive(const ControllableEntity* player) const
+    bool Quest::isInactive(const PlayerInfo* player) const
     {
         return this->getStatus(player) == questStatus::inactive;
@@ -328 +328 @@
         Throws an exception if getStatus throws one.
     */
-    bool Quest::isActive(const ControllableEntity* player) const
+    bool Quest::isActive(const PlayerInfo* player) const
     {
 
@@ -344 +344 @@
         Throws an exception if getStatus throws one.
     */
-    bool Quest::isFailed(const ControllableEntity* player) const
+    bool Quest::isFailed(const PlayerInfo* player) const
     {
         return this->getStatus(player) == questStatus::failed;
@@ -359 +359 @@
         Throws an exception if getStatus throws one.
     */
-    bool Quest::isCompleted(const ControllableEntity* player) const
+    bool Quest::isCompleted(const PlayerInfo* player) const
     {
         return this->getStatus(player) == questStatus::completed;
@@ -372 +372 @@
         Returns true if the Quest could be started, false if not.
     */
-    bool Quest::start(ControllableEntity* player)
+    bool Quest::start(PlayerInfo* player)
     {
         if(this->isStartable(player)) //!< Checks whether the quest can be started.