adjust fp-search distance

Author: Try

game/game/gamescript.cpp

@@ -1700,7 +1700,7 @@ bool GameScript::wld_isfpavailable(std::shared_ptr<zenkit::INpc> self, std::stri
     }
 
   auto wp = world().findFreePoint(*findNpc(self.get()),name);
-  return wp != nullptr;
+  return wp!=nullptr;
   }
 
 bool GameScript::wld_isnextfpavailable(std::shared_ptr<zenkit::INpc> self, std::string_view name) {
@@ -2275,7 +2275,7 @@ bool GameScript::npc_isonfp(std::shared_ptr<zenkit::INpc> npcRef, std::string_vi
     return false;
 
   auto w = npc->currentWayPoint();
-  if(w==nullptr || !MoveAlgo::isClose(npc->position(),*w) || !w->checkName(val))
+  if(w==nullptr || !MoveAlgo::isClose(npc->position(),*w,MAX_AI_USE_DISTANCE) || !w->checkName(val))
     return false;
   return w->isFreePoint();
   }

game/game/movealgo.cpp

@@ -689,15 +689,14 @@ int32_t MoveAlgo::diveTime() const {
   }
 
 bool MoveAlgo::isClose(const Tempest::Vec3& w, const WayPoint &p) {
-  return isClose(w.x,w.y,w.z,p);
+  float dist = closeToPointThreshold;
+  if(p.useCounter()>1)
+    dist += 100; // need
+  return isClose(w,p,dist);
   }
 
-bool MoveAlgo::isClose(float x, float y, float z, const WayPoint &p) {
-  return isClose(x,y,z,p,closeToPointThreshold);
-  }
-
-bool MoveAlgo::isClose(float x, float /*y*/, float z, const WayPoint &p, float dist) {
-  float len = p.qDistTo(x,p.pos.y,z);
+bool MoveAlgo::isClose(const Tempest::Vec3& w, const WayPoint& p, float dist) {
+  float len = p.qDistTo(w.x,p.pos.y,w.z);
   return (len<dist*dist);
   }
 

game/game/movealgo.h

@@ -35,8 +35,7 @@ class MoveAlgo final {
       };
 
     static bool isClose(const Tempest::Vec3& w, const WayPoint& p);
-    static bool isClose(float x,float y,float z,const WayPoint& p);
-    static bool isClose(float x,float y,float z,const WayPoint& p,float dist);
+    static bool isClose(const Tempest::Vec3& w, const WayPoint& p,float dist);
 
     void    load(Serialize& fin);
     void    save(Serialize& fout) const;

game/world/objects/npc.cpp

@@ -1397,7 +1397,7 @@ bool Npc::implGoTo(uint64_t dt) {
     if(!mvAlgo.checkLastBounce())
       dist = MoveAlgo::closeToPointThreshold*1.5f;
     if(go2.wp!=nullptr && go2.wp->useCounter()>1)
-      dist += 100;
+      dist = float(MAX_AI_USE_DISTANCE);
     }
   return implGoTo(dt,dist);
   }