Changeset 11384 for code/branches

Timestamp:

Mar 30, 2017, 3:55:28 PM (8 years ago)

Author:

rrogge

Message:

Kein Identifier Problem mehr

Location:

code/branches/Dialogue_FS17/src/modules/dialogue

Files:

• DialogueManager.cc (modified) (2 diffs)
• DialogueManager.h (modified) (4 diffs)

code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc

@@ -13 +13 @@
 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;
@@ -39 +47 @@
         }
 
-        vector<std::string> getanswers(void){
+        vector<std::string> DialogueManager::getanswers(void){
                 return options;
         }
 
-        int getnumOptions(){
+        int DialogueManager::getnumOptions(){
                 return options.size();
         }

code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h

@@ -11 +11 @@
 #include <vector>
 #include "OrxonoxPrereqs.h"
+#include "core/config/Configurable.h"
 
 //tolua_begin
@@ -16 +17 @@
 //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);
 
@@ -36 +39 @@
                         
 
-                        std::string question;
+                        
                         std::string npc;
                         std::vector<std::string> options;
@@ -42 +45 @@
 */
 private:
+        std::string question;
         static DialogueManager* singletonPtr_s;