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

Timestamp:

Nov 27, 2017, 4:57:47 PM (6 years ago)

Author:

maxima

Message:

No more compiler errors. XMLPortObjects not yet implemented.

File:

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

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

@@ -3 +3 @@
 #include "core/XMLPort.h"
 #include "core/EventIncludes.h"
+#include "Dialog.h"
+#include "Question.h"
 
 namespace orxonox
@@ -21 +23 @@
                 XMLPortParam(Dialog, "name", setName, getName, xmlelement, mode);
                 XMLPortParam(Dialog, "currentQuestionId", setCurrentQuestionId, getCurrentQuestionId, xmlelement, mode);
-                XMLPortObject(Dialog, Question, "Questions", addQuestion, getQuestion, xmlelement,mode);
+                XMLPortObject(Dialog, Question, "Questions", addQuestion, getQuestion, xmlelement, mode);
                 XMLPortObject(Dialog, Answer, "Answers", addAnswer, getAnswer, xmlelement, mode);
         }
@@ -53 +55 @@
 
 
-        void Dialog::addQuestion(Question question) //fuegt Question der Map hinzu
+        void Dialog::addQuestion(Question* question) //fuegt Question der Map hinzu
         {
-                //questions_.emplace(question.getQuestionId, question);
+                //questions_.emplace(question->getQuestionId(), question->getQuestion());
         }
 
-        void Dialog::addAnswer(Answer answer) //fuegt Answer der Map hinzu
+        void Dialog::addAnswer(Answer* answer) //fuegt Answer der Map hinzu
         {
-                //answers_.emplace(std::make_pair(answer.getAnswerId, answer));
+                //answers_.emplace(std::make_pair(answer->getAnswerId(), answer->getAnswer()));
         }
 
-        std::string Dialog::getQuestion() // returned nichts
+        Question* Dialog::getQuestion(unsigned int index) const // returned nichts
         {
-                Question question = (questions_.find(this->currentQuestionId_))->second;
-                return question.getQuestion();
+                return nullptr;
+                // Question question = (questions_.find(this->currentQuestionId_))->second;
+                // return question.getQuestion();
         }
 
-        std::string Dialog::getAnswer(std::string answerId) //tolua_export              //returned sting der Antwort zur Id.
+        Answer* Dialog::getAnswer(unsigned int index) const//tolua_export               //returned sting der Antwort zur Id.
         {
-                return (this->answers_.find(answerId))->second.getAnswer();
+                return nullptr;
+                // return (this->answers_.find(answerId))->second.getAnswer();
         }