[Orxonox-commit 6762] r11390 - code/branches/Dialogue_FS17/src/modules/dialogue

[rrogge at orxonox.net]

Author: rrogge
Date: 2017-03-30 16:04:09 +0200 (Thu, 30 Mar 2017)
New Revision: 11390

Modified:
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
Log:
Default Fenster funktioniert noch nicht

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-03-30 14:03:46 UTC (rev 11389)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-03-30 14:04:09 UTC (rev 11390)
@@ -28,11 +28,8 @@
         //SetConfigValue(question,std::string).description("Question");
         
     }
-	/*std::string DialogueManager::setnpc(std::string npc){
-		return npc;
-	}
 
-	void DialogueManager::setquestion(std::string question){
+    void DialogueManager::setquestion(std::string question){
 		question=question;
 	}
 
@@ -39,7 +36,18 @@
 	std::string DialogueManager::getquestion(void){
 		return question;
 	}
+	void DialogueManager::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(DialogueManager, XMLPort, xmlelement, mode);
 
+        XMLPortParam(DialogueManager, "question", setquestion, getquestion, xmlelement, mode);
+    }
+	/*std::string DialogueManager::setnpc(std::string npc){
+		return npc;
+	}
+
+	
+
 	void DialogueManager::setanswers(std::string option1, std::string option2, std::string option3){
 		options.at(0)=option1;
 		options.at(1)=option2;
@@ -54,10 +62,5 @@
 		return options.size();
 	}
 
-	void DialogueManager::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(DialogueManager, XMLPort, xmlelement, mode);
-
-        XMLPortParam(DialogueManager, "question", setquestion, getquestion, xmlelement, mode);
-    }*/
+	*/
 }
\ No newline at end of file

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	2017-03-30 14:03:46 UTC (rev 11389)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	2017-03-30 14:04:09 UTC (rev 11390)
@@ -11,6 +11,7 @@
 #include <vector>
 #include "OrxonoxPrereqs.h"
 #include "core/config/Configurable.h"
+#include "core/XMLPort.h"
 
 //tolua_begin
 namespace orxonox
@@ -25,12 +26,12 @@
 		DialogueManager(); // tolua_export
 		static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } 
 		void setConfigValues();
-		/*virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+		virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
 			void setquestion(std::string question);
 			std::string getquestion(void);
 
-			std::string setnpc(std::string npc);
+			/*std::string setnpc(std::string npc);
 
 			void setanswers(std::string option1, std::string option2, std::string option3);
 			std::vector <std::string> getanswers(void);