Changeset 2021 for code/branches/questsystem/src/orxonox/objects/LocalQuest.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/LocalQuest.cc (modified) (7 diffs)

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

@@ -35 +35 @@
     CreateFactory(LocalQuest);
 
+    LocalQuest::LocalQuest() : Quest()
+    {
+        
+    }
+
     /**
     @brief
@@ -45 +50 @@
         The description of the quest.
     */
-    LocalQuest::LocalQuest(std::string id, std::string title = "", std::string description = "") : Quest(id, title, description)
+    LocalQuest::LocalQuest(std::string id, std::string title, std::string description) : Quest(id, title, description)
     {
         RegisterObject(LocalQuest);
@@ -67 +72 @@
         Returns true if the quest can be started, false if not.
     */
-    bool LocalQuest::isStartable(const Player & player) const
+    bool LocalQuest::isStartable(Player* player)
     {
         return this->isInactive(player);
@@ -80 +85 @@
         Returns true if the quest can be failed, false if not.
     */
-    bool LocalQuest::isFailable(const Player & player) const
+    bool LocalQuest::isFailable(Player* player)
     {
         return this->isActive(player);
@@ -93 +98 @@
         Returns true if the quest can be completed, false if not.
     */
-    bool LocalQuest::isCompletable(const Player & player) const
+    bool LocalQuest::isCompletable(Player* player)
     {
         return this->isActive(player);
@@ -106 +111 @@
         Returns the status of the quest for the input player.
     */
-    virtual questStatus::Enum LocalQuest::getStatus(const Player & player) const
+    questStatus::Enum LocalQuest::getStatus(const Player* player)
     {
-        std::map<Player*, questStatus::Enum>::iterator it = this->playerStatus_.find(&player);
+        std::map<Player*, questStatus::Enum>::const_iterator it = this->playerStatus_.find((Player*)(void*)player); //Thx. to x3n for the (Player*)(void*) 'hack'.
         if (it != this->playerStatus_.end())
         {
@@ -124 +129 @@
         The status.
     */
-    virtual void LocalQuest::setStatus(const Player & player, const questStatus::Enum & status)
+    bool LocalQuest::setStatus(Player* player, const questStatus::Enum & status)
     {
-        this->playerStatus[&player] = status;
+        this->playerStatus_[player] = status;
+        return true;
     }