More items

src/Game.cpp

@@ -159,7 +159,7 @@ namespace ZL
 		std::cout << "Load resurces step 4" << std::endl;
 
 		LocationSetup uniInteriorParams;
-		uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects.json";
+		uniInteriorParams.gameObjectsJsonPath = "resources/config2/gameobjects_uni_interior.json";
 		uniInteriorParams.npcsJsonPath = "resources/config2/npcs_uni_interior.json";
 		uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues.json";
 		//uniInteriorParams.navigationJsonPaths = {"resources/config2/navigation.json"};
@@ -806,6 +806,7 @@ namespace ZL
 			return;
 		}
 
+
 		// Only the primary, non-UI-captured pointer can promote itself into a
 		// camera-rotation drag once it crosses the movement threshold.
 		if (hasPrimaryPointer && fingerId == primaryPointerId && it != activePointers.end()
@@ -817,6 +818,7 @@ namespace ZL
 			}
 		}
 
+
 		if (currentLocation) {
 			// Forwarded for dialogue hover and (when cameraDragging) camera rotation.
 			currentLocation->handleMotion(fingerId, eventX, eventY, mx, my);