Changeset 11415 for code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h

Timestamp:

May 11, 2017, 3:04:50 PM (7 years ago)

Author:

rrogge

Message:

Singletonkram figured out

File:

• code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h (modified) (3 diffs)

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

@@ -16 +16 @@
 
 
+
+
 namespace orxonox //tolua_export
 
 {//tolua_export
         class _OrxonoxExport DialogueManager //tolua_export
-        : public Singleton<DialogueManager>, public BaseObject
+        : public Singleton<DialogueManager>
         {//tolua_export
                 friend class Singleton<DialogueManager>;
@@ -27 +29 @@
                 
 
-                DialogueManager(Context* context); 
+                DialogueManager(); 
                 
 
@@ -56 +58 @@
 */
 private:
+        //NextQuestion currentQuestion;
         std::string a1;
         std::string a2;