merge

src/Game.h

@@ -21,6 +21,7 @@
 #include "MenuManager.h"
 #include "ScriptEngine.h"
 #include <unordered_map>
+#include "dialogue/DialogueSystem.h"
 #include <unordered_set>
 
 namespace ZL {
@@ -36,6 +37,9 @@ namespace ZL {
 		void render();
 
 		bool shouldExit() const { return Environment::exitGameLoop; }
+		bool requestDialogueStart(const std::string& dialogueId);
+		void setDialogueFlag(const std::string& flag, int value);
+		int getDialogueFlag(const std::string& flag) const;
 
 		Renderer renderer;
 		TaskManager taskManager;
@@ -113,6 +117,10 @@ namespace ZL {
 
 		static const size_t CONST_TIMER_INTERVAL = 10;
 		static const size_t CONST_MAX_TIME_INTERVAL = 1000;
+
+		//MenuManager menuManager;
+		Dialogue::DialogueSystem dialogueSystem;
+		//ScriptEngine scriptEngine;
 	};