merge

src/Location.cpp

@@ -183,6 +183,7 @@ namespace ZL
 			std::cerr << "Failed to init NPC name TextRenderer" << std::endl;
 			npcNameText.reset();
 		}
+		dialogueSystem.loadDatabase("resources/dialogue/sample_dialogues.json");
 		/*dialogueSystem.addTriggerZone({
 			"ghost_room_trigger",
 			"test_line_dialogue",
@@ -1023,6 +1024,10 @@ namespace ZL
 	}
 	void Location::handleUp(int64_t fingerId, int mx, int my)
 	{
+		if (dialogueSystem.blocksGameplayInput()) {
+			dialogueSystem.handlePointerReleased(static_cast<float>(mx), Environment::projectionHeight - static_cast<float>(my));
+			return;
+		}
 
 	}
 	void Location::handleMotion(int64_t fingerId, int eventX, int eventY, int mx, int my)