Changeset 2021 for code/branches/questsystem/src/orxonox/objects/GlobalQuest.cc

Timestamp:

Oct 27, 2008, 8:31:20 PM (16 years ago)

Author:

dafrick

Message:

Nearly compiles, some minor improvements.

File:

• code/branches/questsystem/src/orxonox/objects/GlobalQuest.cc (modified) (7 diffs)

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

@@ -35 +35 @@
     CreateFactory(GlobalQuest);
 
+    GlobalQuest::GlobalQuest() : Quest()
+    {
+        
+    }
+
     /**
     @brief
@@ -45 +50 @@
         The description of the quest.
     */
-    GlobalQuest::GlobalQuest(std::string id, std::string title = "", std::string description = "") : Quest(id, title, description)
+    GlobalQuest::GlobalQuest(std::string id, std::string title, std::string description) : Quest(id, title, description)
     {
         RegisterObject(GlobalQuest);
@@ -67 +72 @@
         Returns true if the quest can be started, false if not.
     */
-    bool GlobalQuest::isStartable(const Player & player) const
+    bool GlobalQuest::isStartable(Player* player)
     {
         return this->isInactive(player) || this->isActive(player);
@@ -80 +85 @@
         Returns true if the quest can be failed, false if not.
     */
-    bool GlobalQuest::isFailable(const Player & player) const
+    bool GlobalQuest::isFailable(Player* player)
     {
         return this->isActive(player);
@@ -93 +98 @@
         Returns true if the quest can be completed, false if not.
     */
-    bool GlobalQuest::isCompletable(const Player & player) const
+    bool GlobalQuest::isCompletable(Player* player)
     {
         return this->isActive(player);
@@ -104 +109 @@
         The player.
     */
-    questStatus::Enum getStatus(const Player & player) const
+    questStatus::Enum GlobalQuest::getStatus(const Player* player)
     {
         //TDO: Does this really work???
-        if (this->players_.find(&player) != this->players_.end())
+        std::set<Player*>::const_iterator it = this->players_.find((Player*)(void*)player);
+        if (it != this->players_.end())
         {
             return this->status_;
@@ -126 +132 @@
         The status to be set.
     */
-    void setStatus(const Player & player, const questStatus::Enum & status)
+    bool GlobalQuest::setStatus(Player* player, const questStatus::Enum & status)
     {
-        if (this->players_.find(&player) == this->players_.end()) //!< Player is not yet in the list.
+        std::set<Player*>::const_iterator it = this->players_.find(player);
+        if (it == this->players_.end()) //!< Player is not yet in the list.
         {
-            this->players_.insert(&player);
+            this->players_.insert(player);
         }
         this->status_ = status;
+        return true;
     }