Changeset 11611 for code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc

Timestamp:

Nov 30, 2017, 9:33:27 AM (6 years ago)

Author:

kuchlert

Message:

fixed addQuestion and addAnswer in Dialog

File:

• code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc (modified) (5 diffs)

code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc

@@ -5 +5 @@
 #include "Dialog.h"
 #include "Question.h"
+
 
 namespace orxonox
@@ -57 +58 @@
         void Dialog::addQuestion(Question* question) //fuegt Question der Map hinzu
         {
-                //questions_.emplace(question->getQuestionId(), question->getQuestion());
+                this->questions_.insert(make_pair(question->getQuestionId(), question));
         }
 
         void Dialog::addAnswer(Answer* answer) //fuegt Answer der Map hinzu
         {
-                //answers_.emplace(std::make_pair(answer->getAnswerId(), answer->getAnswer()));
+                this->answers_.insert(make_pair(answer->getAnswerId(), answer));
         }
 
@@ -72 +73 @@
         }
 
-        Answer* Dialog::getAnswer(unsigned int index) const//tolua_export               //returned sting der Antwort zur Id.
+        Answer* Dialog::getAnswer(unsigned int index) const     //returned sting der Antwort zur Id.
         {
                 return nullptr;
@@ -81 +82 @@
         {
 
-                Question question = (questions_.find(this->currentQuestionId_))->second;
-                std::vector<std::string> answers = question.getAnswerIds();
+                Question* question = (this->questions_.find(this->currentQuestionId_))->second;
+                std::vector<std::string> answers = question->getAnswerIds();
                 return answers;
         } 
@@ -98 +99 @@
     void Dialog::update(std::string givenAnswer)
     {
-        Answer answer = (answers_.find(givenAnswer))->second;
-        this->currentQuestionId_ = answer.getNextQuestion();
+        Answer* answer = (answers_.find(givenAnswer))->second;
+        this->currentQuestionId_ = answer->getNextQuestion();
     }
 
-    bool Dialog::ending() //tolua_export        //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
+    bool Dialog::ending() //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
     {
         bool end = false;
         if (this->currentQuestionId_ == "end"){
                 end = true;
-        } else if ((questions_.find(this->currentQuestionId_)->second).getAnswerIds().empty()){
+        } else if ((this->questions_.find(this->currentQuestionId_)->second)->getAnswerIds().empty()){
                 end = true;
         }