Changeset 11390 for code/branches/Dialogue_FS17/src

Timestamp:

Mar 30, 2017, 4:04:09 PM (8 years ago)

Author:

rrogge

Message:

Default Fenster funktioniert noch nicht

Location:

code/branches/Dialogue_FS17/src/modules/dialogue

Files:

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

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

@@ -29 +29 @@
         
     }
-        /*std::string DialogueManager::setnpc(std::string npc){
-                return npc;
-        }
 
-        void DialogueManager::setquestion(std::string question){
+    void DialogueManager::setquestion(std::string question){
                 question=question;
         }
@@ -40 +37 @@
                 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){
@@ -55 +63 @@
         }
 
-        void DialogueManager::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(DialogueManager, XMLPort, xmlelement, mode);
-
-        XMLPortParam(DialogueManager, "question", setquestion, getquestion, xmlelement, mode);
-    }*/
+        */
 }

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

@@ -12 +12 @@
 #include "OrxonoxPrereqs.h"
 #include "core/config/Configurable.h"
+#include "core/XMLPort.h"
 
 //tolua_begin
@@ -26 +27 @@
                 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);