Changeset 2081

Timestamp:

Nov 1, 2008, 11:00:46 AM (15 years ago)

Author:

dafrick

Message:

Ready for merge! (It won't compile after the merge, though )

Location:

code/branches/questsystem/src/orxonox/objects

Files:

• AddQuestHint.cc (modified) (2 diffs)
• AddQuestHint.h (modified) (1 diff)
• ChangeQuestStatus.cc (modified) (2 diffs)
• ChangeQuestStatus.h (modified) (1 diff)
• GlobalQuest.cc (modified) (1 diff)
• LocalQuest.cc (modified) (1 diff)
• Quest.cc (modified) (5 diffs)
• QuestDescription.cc (modified) (1 diff)
• QuestHint.cc (modified) (1 diff)
• QuestItem.cc (modified) (1 diff)
• QuestItem.h (modified) (1 diff)

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

@@ -31 +31 @@
 
 #include "QuestManager.h"
+#include "QuestItem.h"
 #include "AddQuestHint.h"
 
@@ -56 +57 @@
         XMLPortParam(AddQuestHint, "hintId", setHintId, getHintId, xmlelement, mode);
         
+    }
+
+    inline void AddQuestHint::setHintId(const std::string & id)
+    {
+        if(!QuestItem::isId(id))
+        {
+            COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
+            return;
+        }
+        this->hintId_ = id;
     }
 

code/branches/questsystem/src/orxonox/objects/AddQuestHint.h

@@ -59 +59 @@
             inline const std::string & getHintId(void) const
                 { return this->hintId_; }
-            inline void setHintId(const std::string & id)
-                { this->hintId_ = id; }
+            void setHintId(const std::string & id);
     
     };

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

@@ -29 +29 @@
 #include "core/CoreIncludes.h"
 
+#include "QuestItem.h"
 #include "ChangeQuestStatus.h"
 
@@ -46 +47 @@
     }
     
+    void ChangeQuestStatus::setQuestId(const std::string & id)
+    {
+        if(!QuestItem::isId(id))
+        {
+            COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
+            return;
+        }
+        this->questId_ = id;
+    }
+    
     void ChangeQuestStatus::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {

code/branches/questsystem/src/orxonox/objects/ChangeQuestStatus.h

@@ -62 +62 @@
             
         private:
-            inline void setQuestId(const std::string & id)
-                { this->questId_ = id; }
+            void setQuestId(const std::string & id);
 
     };

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

@@ -58 +58 @@
         SUPER(GlobalQuest, XMLPort, xmlelement, mode);
 
-        COUT(1) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
+        COUT(3) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
     }
     

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

@@ -54 +54 @@
         SUPER(LocalQuest, XMLPort, xmlelement, mode);
 
-        COUT(1) << "New LocalQuest {" << this->getId() << "} created." << std::endl;
+        COUT(3) << "New LocalQuest {" << this->getId() << "} created." << std::endl;
     }
     

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

@@ -88 +88 @@
         
         this->parentQuest_ = quest;
+        
+        COUT(3) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
         return true;
     }
@@ -109 +111 @@
         quest->setParentQuest(this);
         this->subQuests_.push_back(quest);
+        
+        COUT(3) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
         return true;
     }
@@ -131 +135 @@
         this->hints_.push_back(hint);
         hint->setQuest(this);
+        
+        COUT(3) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
         return true;
     }
@@ -147 +153 @@
         
         this->failEffects_.push_back(effect);
+        
+        COUT(3) << "A FailEffect was added to Quest {" << this->getId() << "}." << std::endl;
         return true;
     }
@@ -163 +171 @@
         
         this->completeEffects_.push_back(effect);
+        
+        COUT(3) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << std::endl;
         return true;
     }

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

@@ -52 +52 @@
         XMLPortParam(QuestDescription, "description", setDescription, getDescription, xmlelement, mode);
         
-        COUT(1) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
+        COUT(3) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
     }
     

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

@@ -64 +64 @@
         SUPER(QuestHint, XMLPort, xmlelement, mode);
         
-        COUT(1) << "New QuestHint {" << this->getId() << "} created." << std::endl;
+        COUT(3) << "New QuestHint {" << this->getId() << "} created." << std::endl;
     }
 

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

@@ -71 +71 @@
     }
     
+    void QuestItem::setId(const std::string & id)
+    {
+        if(!isId(id))
+        {
+            COUT(2) << "Invalid id. QuestItem id {" << id << "} could not be set." << std::endl;
+            return;
+        }
+        this->id_ = id;
+    }
+    
     //const QuestDescription* QuestItem::getDescription(unsigned int index) const //!< Returns the description of the QuestItem.
     //{

code/branches/questsystem/src/orxonox/objects/QuestItem.h

@@ -64 +64 @@
             
         protected:
-            inline void setId(const std::string & id)
-                { id_ = id; }
+            void setId(const std::string & id);
             inline void setDescription(QuestDescription* description)
                 { this->description_ = description; }