merge

src/items/GameObjectLoader.cpp

@@ -280,6 +280,7 @@ namespace ZL {
 				data.id = item.value("id", "npc_unknown");
 				data.name = item.value("name", "Unknown NPC");
 				data.texturePath = item.value("texturePath", "");
+				data.interactionRadius = item.value("interactionRadius", 0.0f);
 				data.animationIdlePath = item.value("animationIdlePath", "");
 				data.animationWalkPath = item.value("animationWalkPath", "");
 
@@ -379,6 +380,7 @@ namespace ZL {
 			npc->rotationSpeed = npcData.rotationSpeed;
 			npc->modelScale = npcData.modelScale;
 			npc->position = Eigen::Vector3f(npcData.positionX, npcData.positionY, npcData.positionZ);
+			npc->interactionRadius = npcData.interactionRadius;
 
 			// Set NPC metadata
 			npc->npcId = npcData.id;

src/items/GameObjectLoader.h

@@ -57,6 +57,7 @@ namespace ZL {
 		float modelCorrectionRotY = 0.0f;
 		float modelCorrectionRotZ = 0.0f;
 		GiftData gift;
+		float interactionRadius = 0.0f;
 	};
 
 	struct LoadedGameObject {