merge

src/Character.h

@@ -60,6 +60,7 @@ public:
     std::string npcName;
     bool giftReceived = false;
 
+
     int battle_state = 0;
     bool resetAnim = false;
     int attack = 0;
@@ -70,6 +71,9 @@ public:
     bool isPlayer = false;
     bool useGpuSkinning = true;
 
+    float interactionRadius = 0.0f;
+
+
 private:
     struct AnimationData {
         BoneSystem model;