Index: code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt	(revision 11401)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt	(revision 11406)
@@ -8,4 +8,6 @@
   MODULE
   FIND_HEADER_FILES
+   TOLUA_FILES
+    DialogueManager.h
   LINK_LIBRARIES
     orxonox
Index: code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.layout
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.layout	(revision 11401)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<GUILayout >
-    <Window Type="DefaultWindow" Name="orxonox/PickupInventory/Background" > 
-    	<Property Name="InheritsAlpha" Value="False" />
-        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
-        <Window Type="MenuWidgets/StaticText" Name="orxonox/PickupInventory/PickupInventory" >
-            <Property Name="Text" Value="Pickup Inventory" />
-            <Property Name="Alpha" Value="0.8" />
-            <Property Name="InheritsAlpha" Value="False" />
-            <Property Name="HorzFormatting" Value="HorzCentred" />
-            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-            <Property Name="VertFormatting" Value="TopAligned" />
-            <Property Name="UnifiedAreaRect" Value="{{0.15,0},{0.15,0},{0.85,0},{0.8,0}}" />
-            <Window Type="MenuWidgets/StaticText" Name="orxonox/PickupInventory/Wrapper" >
-                <Property Name="TextColours" Value="FF4444FF" />
-                <Property Name="InheritsAlpha" Value="False" />
-                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
-                <Property Name="HorzFormatting" Value="HorzCentred" />
-                <Property Name="VertFormatting" Value="TopAligned" />
-                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.92,0}}" />
-            </Window>
-        </Window>
-    </Window>
-</GUILayout>
Index: code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.lua
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/Dialogue.lua	(revision 11401)
+++ 	(revision )
@@ -1,31 +1,0 @@
-local P = createMenuSheet("Dialogue Window")
-
-function P.onLoad()
-	P.createWindow()    
-end
-
-
-
-
-
-function P.createWindow()
-    
-    local question = orxonox.DialogueManager:getInstance():getquestion()
-    local default = (winMgr:createWindow("DefaultWindow"))
-    default:setText(question)
-    default:setProperty("UnifiedMaxSize", "{{1,0},{1,0}}")
-    default:setProperty("UnifiedAreaRect", "{{0,0},{0,0},{1,0},{1,0}}")
-    
-    
-
-
-    
-end
---[[local numOptions = DialogueManager:getnumOptions()
-    local counter = 1
-    local offset = 0
-    --create and name buttons while there are still options
-    while counter <= numOptions do
-        
-        
-    end]]
Index: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	(revision 11401)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	(revision 11406)
@@ -22,4 +22,5 @@
 
 	DialogueManager::DialogueManager(Context* context): BaseObject(context){
+		orxout() << "Dialog Konstruktor" << endl;
 		RegisterObject(DialogueManager);
 		
@@ -34,9 +35,12 @@
     
 
-    void DialogueManager::setquestion(std::string question){
-		question=question;
+    void DialogueManager::setquestion(std::string q){
+		orxout() << "setquestion" << endl;
+		question=q;
+		orxout() << "Question is " << question;
 	}
 
 	std::string DialogueManager::getquestion(void){
+		orxout() << question << endl;
 		return question;
 	}
Index: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	(revision 11401)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	(revision 11406)
@@ -14,22 +14,23 @@
 #include "core/EventIncludes.h"
 
-//tolua_begin
-namespace orxonox
-//tolua_end
-{//toluaexport
-	class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>, public BaseObject
-	{
+
+namespace orxonox //tolua_export
+
+{//tolua_export
+	class _OrxonoxExport DialogueManager //tolua_export
+	: public Singleton<DialogueManager>, public BaseObject
+	{//tolua_export
 		friend class Singleton<DialogueManager>;
-		//tolua_begin
+	
 		public:
 		
 
-		DialogueManager(Context* context); // tolua_export
+		DialogueManager(Context* context); 
 		
 
-		static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } 
+		static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } //tolua_export
 		
-		void setquestion(std::string question);
-		std::string getquestion(void);
+		void setquestion(std::string question); //tolua_export
+		std::string getquestion(void); //tolua_export
 		
 
@@ -48,5 +49,5 @@
 			std::string npc;
 			std::vector<std::string> options;
-		//tolua_end
+		
 */
 private:
@@ -54,4 +55,5 @@
 	static DialogueManager* singletonPtr_s;
 
-	};//toluaexport
-}
+	};//tolua_export
+}//tolua_export
+
Index: code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc	(revision 11401)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc	(revision 11406)
@@ -3,4 +3,5 @@
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
+#include "overlays/OrxonoxOverlay.h"
 
 
@@ -16,12 +17,15 @@
         RegisterObject(NextQuestion);
         orxout() << "Klasse aufgerufen" << endl;
+         DialogueManager* d = new DialogueManager(context);
+        
 
     }
 
 	void NextQuestion::setquestion(std::string question){
-		question=question;
+		this->question=question;
 	}
 
 	std::string NextQuestion::getquestion(void){
+		orxout() << question;
 		return question;
 	}
@@ -47,8 +51,15 @@
         orxout() << "bTriggered is " << bTriggered << endl;
 
-        for (DialogueManager* hud : ObjectList<DialogueManager>())
-            m = hud;
-        m->setquestion(question);
-        //orxout() << " 1 " << mystring << endl;
+        //for (DialogueManager* hud : ObjectList<DialogueManager>())
+            //m = hud;
+
+        DialogueManager& m = DialogueManager::getInstance();
+        	
+        m.setquestion(question);
+        orxout() << " 1 " << endl;
+
+       
+        OrxonoxOverlay::showOverlay("Dialogue");
+
         return false;
     }
