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

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

@@ -28 +28 @@
 
 #include "core/CoreIncludes.h"
+
+#include "Quest.h"
 #include "QuestHint.h"
 
@@ -33 +35 @@
 
     CreateFactory(QuestHint);
+
+    QuestHint::QuestHint() : QuestItem()
+    {
+        
+    }
 
     /**
@@ -44 +51 @@
         The description of the hint, resp. the hint itself.
     */
-    QuestHint::QuestHint(std::string id, std::string title = "", std::string description = "") : QuestItem(id, title, description)
+    QuestHint::QuestHint(std::string id, std::string title, std::string description) : QuestItem(id, title, description)
     {
         RegisterObject(QuestHint);
@@ -66 +73 @@
         Returns 
     */
-    bool QuestHint::isActive(const Player & player) const
+    bool QuestHint::isActive(Player* player)
     {
-        std::map<Player*, questHintStatus::Enum>::iterator it = this->playerStatus_.find(&player);
+        std::map<Player*, questHintStatus::Enum>::iterator it = this->playerStatus_.find(player);
         if (it != this->playerStatus_.end())
         {
@@ -76 +83 @@
     }
     
-    bool QuestHint::activate(const Player & player)
+    /**
+    @brief
+    @param player
+    @return
+    */
+    bool QuestHint::activate(Player* player)
     {
-        if(this->quest_->isActive(player) && !this->isActive())
+        if(this->quest_->isActive(player) && !(this->isActive(player)))
         {
-            this->playerStatus_[&player] = questHintStatus::active;
+            this->playerStatus_[player] = questHintStatus::active;
             return true;
         }
@@ -87 +99 @@
     }
 
+    /**
+    @brief
+    @param quest
+    @return
+    */
     void QuestHint::setQuest(Quest* quest)
     {