remove non-vector overload for distance

Author: Try

game/world/objects/interactive.cpp

@@ -565,7 +565,7 @@ P* Interactive::findNearest(Inter& in, const Npc& to) {
   for(auto& i:in.attPos) {
     if(i.user || !i.isAttachPoint())
       continue;
-    float d = in.qDistanceTo(to,i);
+    float d = in.qDistTo(to,i);
     if(d<dist || p==nullptr) {
       p    = &i;
       dist = d;
@@ -853,9 +853,9 @@ void Interactive::setDir(Npc &npc, const Tempest::Matrix4x4 &mat) {
   npc.setDirection(Tempest::Vec3(x1-x0, y1-y0, z1-z0));
   }
 
-float Interactive::qDistanceTo(const Npc &npc, const Interactive::Pos &to) const {
+float Interactive::qDistTo(const Npc &npc, const Interactive::Pos &to) const {
   auto p = worldPos(to);
-  return npc.qDistTo(p.x,p.y-npc.translateY(),p.z);
+  return npc.qDistTo(p);
   }
 
 Tempest::Matrix4x4 Interactive::nodeTranform(const Npc &npc, const Pos& p) const {

game/world/objects/interactive.h

@@ -136,7 +136,7 @@ class Interactive : public Vob {
     const Pos*          findFreePos() const;
     Pos*                findFreePos();
     auto                worldPos(const Pos &to) const -> Tempest::Vec3;
-    float               qDistanceTo(const Npc &npc, const Pos &to) const;
+    float               qDistTo(const Npc &npc, const Pos &to) const;
     Tempest::Matrix4x4  nodeTranform(const Npc &npc, const Pos &p) const;
     auto                nodePosition(const Npc &npc, const Pos &p) const -> Tempest::Vec3;
 

game/world/objects/npc.cpp

@@ -686,15 +686,9 @@ std::string_view Npc::formerPortalName() {
   return mvAlgo.formerPortalName();
   }
 
-float Npc::qDistTo(float x1, float y1, float z1) const {
-  float dx=x-x1;
-  float dy=y+translateY()-y1;
-  float dz=z-z1;
-  return dx*dx+dy*dy+dz*dz;
-  }
-
-float Npc::qDistTo(const Tempest::Vec3 pos) const {
-  return qDistTo(pos.x,pos.y,pos.z);
+float Npc::qDistTo(const Vec3 pos) const {
+  auto dp = pos - Vec3(x,y+translateY(),z);
+  return dp.quadLength();
   }
 
 float Npc::qDistTo(const WayPoint *f) const {
@@ -704,7 +698,7 @@ float Npc::qDistTo(const WayPoint *f) const {
   }
 
 float Npc::qDistTo(const Npc &p) const {
-  return qDistTo(p.x,p.y+p.translateY(),p.z);
+  return qDistTo(Vec3(p.x,p.y+p.translateY(),p.z));
   }
 
 float Npc::qDistTo(const Interactive &p) const {

game/world/objects/npc.h

@@ -123,7 +123,6 @@ class Npc final {
     auto       portalName() -> std::string_view;
     auto       formerPortalName() -> std::string_view;
 
-    float      qDistTo(float x, float y, float z) const;
     float      qDistTo(const Tempest::Vec3 pos) const;
     float      qDistTo(const WayPoint* p) const;
     float      qDistTo(const Npc& p) const;