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

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.cc (modified) (2 diffs)

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

@@ -6 +6 @@
 #include "network/Host.h"
 #include "network/NetworkFunctionIncludes.h"
-#include "DialogueManager.h"
 #include "DialoguePrereqs.h"
 #include <vector>
 #include <string>
 #include "core/XMLPort.h"
+#include "NextQuestion.h"
 
 
 namespace orxonox {
-        //ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
-        RegisterAbstractClass(DialogueManager).inheritsFrom<BaseObject>();
+        ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
+        
 
+        //DialogueManager* DialogueManager::singletonPtr_s =nullptr;
 
-
-        DialogueManager* DialogueManager::singletonPtr_s =nullptr;
-
-        DialogueManager::DialogueManager(Context* context): BaseObject(context){
+        DialogueManager::DialogueManager(){
                 orxout() << "Dialog Konstruktor" << endl;
-                RegisterObject(DialogueManager);
+                //RegisterObject(DialogueManager);
                 
                 
@@ -66 +64 @@
         bool DialogueManager::a1clicked(void){
                 orxout() << "a1 clicked" << endl;
+
                 return true;
         }