NavDisplay: fix update lag when switching range or centre.

[flightgear.git] / src / AIModel / AIEscort.hxx

diff --git a/src/AIModel/AIEscort.hxx b/src/AIModel/AIEscort.hxx
index d2e21f5ae0584cb4fbec34670b3dec210c9c96b3..a300f645eccee1f529ed8dffb17de86a6c5de550 100644 (file)
--- a/src/AIModel/AIEscort.hxx
+++ b/src/AIModel/AIEscort.hxx
@@ -39,17 +39,16 @@ public:
     virtual ~FGAIEscort();
 
     virtual void readFromScenario(SGPropertyNode* scFileNode);
+
+    bool init(bool search_in_AI_path=false);
     virtual void bind();
     virtual void unbind();
-    virtual const char* getTypeString(void) const { return "escort"; }
+    virtual void reinit();
+    virtual void update (double dt);
 
-    bool init(bool search_in_AI_path=false);
+    virtual const char* getTypeString(void) const { return "escort"; }
 
 private:
-
-    virtual void reinit() { init(); }
-    virtual void update (double dt);
-
     void setStnRange(double r);
     void setStnBrg(double y);
     void setStationSpeed();
@@ -70,11 +69,9 @@ private:
 
     SGVec3d getCartHitchPosAt(const SGVec3d& off) const;
 
-//    void calcRangeBearing(double lat, double lon, double lat2, double lon2,
-//        double &range, double &bearing) const;
-    //double calcRelBearingDeg(double bearing, double heading);
-    //double calcTrueBearingDeg(double bearing, double heading);
-    //double calcRecipBearingDeg(double bearing);
+    void calcRangeBearing(double lat, double lon, double lat2, double lon2,
+        double &range, double &bearing) const;
+    double calcTrueBearingDeg(double bearing, double heading);
 
     SGGeod _selectedpos;
     SGGeod _tgtpos;