merge

src/Game.h

@@ -20,7 +20,8 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "Location.h"
-#include "AudioPlayerAsync.h" 
+#include "AudioPlayerAsync.h"
+#include "quest/QuestJournal.h"
 
 namespace ZL {
 
@@ -53,6 +54,11 @@ namespace ZL {
 
 		bool inventoryOpen = false;
 
+		ZL::Quest::QuestJournal questJournal;
+		bool questJournalOpen = false;
+		int selectedQuestIndex = -1;
+		std::vector<std::string> visibleQuestIds;
+
 		MenuManager menuManager;
 		
 		void activateSlowMoEffect();
@@ -101,6 +107,14 @@ namespace ZL {
 		void updatePinchZoom();
 		void endPinch();
 		int countNonUiPointers() const;
+		void handleDown(int64_t fingerId, int mx, int my);
+		void handleUp(int64_t fingerId, int mx, int my);
+		void handleMotion(int64_t fingerId, int mx, int my);
+
+		void setupQuestJournalUi();
+		void toggleQuestJournal();
+		void refreshQuestJournalUi();
+		void selectQuestByIndex(int index);
 		
 #ifdef EMSCRIPTEN
 		static Game* s_instance;