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

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

@@ -28 +28 @@
 
 #include "core/CoreIncludes.h"
+
 #include "Quest.h"
 
 namespace orxonox {
 
-    CreateFactory(Quest);
+    Quest::Quest() : QuestItem()
+    {
+        
+    }
 
     /**
@@ -44 +48 @@
         The description of the quest.
     */
-    Quest::Quest(std::string id, std::string title = "", std::string description = "") : QuestItem(id, title, description)
+    Quest::Quest(std::string id, std::string title, std::string description) : QuestItem(id, title, description)
     {
         initialize();
@@ -75 +79 @@
         A pointer to the quest to be set as parent quest.
     */
-    bool setParentQuest(Quest* quest)
+    bool Quest::setParentQuest(Quest* quest)
     {
         this->parentQuest_ = quest;
@@ -87 +91 @@
         A pointer to the quest to be set as sub quest.
     */
-    bool addSubQuest(Quest & quest)
+    bool Quest::addSubQuest(Quest* quest)
     {
-        this->subQuests_.push_back = quest;
+        this->subQuests_.push_back(quest);
         return true;
     }
@@ -99 +103 @@
         The hint that should be added to the list of hints.
     */
-    void Quest::addHint(QuestHint & hint)
+    void Quest::addHint(QuestHint* hint)
     {
         if ( hint != NULL )
         {
             this->hints_.push_back(hint);
-            hint.setQuest(this);
+            hint->setQuest(this);
         }
         else
@@ -120 +124 @@
         Returns true if the quest could be started, false if not.
     */
-    bool Quest::start(const Player & player)
+    bool Quest::start(Player* player)
     {
         if(this->isStartable(player))
@@ -139 +143 @@
         Returns true if the quest could be failed, false if not.
     */
-    void Quest::fail(Player & player)
+    bool Quest::fail(Player* player)
     {
         if(this->isFailable(player))
@@ -159 +163 @@
         Returns true if the quest could be completed, false if not.
     */
-    void Quest::complete(Player & player)
+    bool Quest::complete(Player* player)
     {
         if(this->isCompletable(player))