[Orxonox-commit 6756] r11384 - code/branches/Dialogue_FS17/src/modules/dialogue

[rrogge at orxonox.net]

Author: rrogge
Date: 2017-03-30 15:55:28 +0200 (Thu, 30 Mar 2017)
New Revision: 11384

Modified:
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
Log:
Kein Identifier Problem mehr

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-03-30 13:52:23 UTC (rev 11383)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-03-30 13:55:28 UTC (rev 11384)
@@ -12,37 +12,45 @@
 
 namespace orxonox {
 	ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
-	RegisterClass(DialogueManager);
+	RegisterClassNoArgs(DialogueManager);
 
 	DialogueManager::DialogueManager(){
 		RegisterObject(DialogueManager);
+		this->setConfigValues();
 
 	}
 	
-
-	/*std::string setnpc(std::string npc){
+	/**
+     * @brief set the config values in the orxonox.ini file
+     */
+    void DialogueManager::setConfigValues()
+    {
+        //SetConfigValue(question,std::string).description("Question");
+        
+    }
+	/*std::string DialogueManager::setnpc(std::string npc){
 		return npc;
 	}
 
-	void setquestion(std::string question){
+	void DialogueManager::setquestion(std::string question){
 		question=question;
 	}
 
-	std::string getquestion(void){
+	std::string DialogueManager::getquestion(void){
 		return question;
 	}
 
-	void setanswers(std::string option1, std::string option2, std::string option3){
+	void DialogueManager::setanswers(std::string option1, std::string option2, std::string option3){
 		options.at(0)=option1;
 		options.at(1)=option2;
 		options.at(2)=option3;
 	}
 
-	vector<std::string> getanswers(void){
+	vector<std::string> DialogueManager::getanswers(void){
 		return options;
 	}
 
-	int getnumOptions(){
+	int DialogueManager::getnumOptions(){
 		return options.size();
 	}
 

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	2017-03-30 13:52:23 UTC (rev 11383)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	2017-03-30 13:55:28 UTC (rev 11384)
@@ -10,18 +10,21 @@
 #include <string>
 #include <vector>
 #include "OrxonoxPrereqs.h"
+#include "core/config/Configurable.h"
 
 //tolua_begin
 namespace orxonox
 //tolua_end
 {//toluaexport
-	class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>{
+	class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>, public Configurable
+	{
 		friend class Singleton<DialogueManager>;
 		//tolua_begin
-		//public:
+		public:
 
-		DialogueManager();
-		static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } // tolua_export
+		DialogueManager(); // tolua_export
+		static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } 
+		void setConfigValues();
 		/*virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
 			void setquestion(std::string question);
@@ -35,12 +38,13 @@
 			int getnumOptions();
 			
 
-			std::string question;
+			
 			std::string npc;
 			std::vector<std::string> options;
 		//tolua_end
 */
 private:
+	std::string question;
 	static DialogueManager* singletonPtr_s;
 
 	};//toluaexport