Changeset 2353 for code/branches

Timestamp:

Dec 7, 2008, 11:44:17 PM (16 years ago)

Author:

dafrick

Message:

Forgot to complie - which it didn't due to some leftovers from the parameter conversion.
But it does now.

File:

• code/branches/questsystem3/src/orxonox/objects/quest/QuestListener.cc (modified) (5 diffs)

code/branches/questsystem3/src/orxonox/objects/quest/QuestListener.cc

@@ -53 +53 @@
         RegisterObject(QuestListener);
         
-        this->status_ = questListenerMode::all;
+        this->mode_ = questListenerMode::all;
         this->quest_ = NULL;
     }
@@ -78 +78 @@
         this->quest_->addListener(this); //!< Adds the QuestListener to the Quests list of listeners.
         
-        COUT(3) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getQuestStatus() << "'." << std::endl;
+        COUT(3) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << std::endl;
     }
     
@@ -94 +94 @@
         {
             QuestListener* listener = *it;
-            if(listener->getMode() == status || listener->getMode() == questListenerMode::all) //!< Check whether the status change affects the give QuestListener.
+            if(listener->getMode() == status || listener->getMode() == "all") //!< Check whether the status change affects the give QuestListener.
             {
                 listener->execute();
@@ -132 +132 @@
     bool QuestListener::setMode(const std::string & mode)
     {
-        if(status == "all")
-        {
-            this->status_ = questListenerMode::all;
-        }
-        else if(status == "start")
-        {
-            this->status_ = questListenerMode::start;
-        }
-        else if(status == "fail")
-        {
-            this->status_ = questListenerMode::fail;
-        }
-        else if(status == "complete")
-        {
-            this->status_ = questListenerMode::complete;
+        if(mode == "all")
+        {
+            this->mode_ = questListenerMode::all;
+        }
+        else if(mode == "start")
+        {
+            this->mode_ = questListenerMode::start;
+        }
+        else if(mode == "fail")
+        {
+            this->mode_ = questListenerMode::fail;
+        }
+        else if(mode == "complete")
+        {
+            this->mode_ = questListenerMode::complete;
         }
         else
         {
             COUT(2) << "QuestListener with invalid mode '" << mode << "' created. Mode set to 'all'." << std::endl;
-            this->status_ = questListenerMode::all;
+            this->mode_ = questListenerMode::all;
             return false;
         }
@@ -166 +166 @@
     const std::string QuestListener::getMode(void)
     {
-        if(this->status_ == questListenerMode::all)
+        if(this->mode_ == questListenerMode::all)
         {
             return "all";
         }
-        else if(this->status_ == questListenerMode::start)
+        else if(this->mode_ == questListenerMode::start)
         {
             return "start";
         }
-        else if(this->status_ == questListenerMode::fail)
+        else if(this->mode_ == questListenerMode::fail)
         {
             return "fail";
         }
-        else if(this->status_ == questListenerMode::complete)
+        else if(this->mode_ == questListenerMode::complete)
         {
             return "complete";