Clean-up: move autosave.xml loading code to proper method

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

diff --git a/src/AIModel/AIEscort.hxx b/src/AIModel/AIEscort.hxx
index 57a60ccb9e178be4996eb661b25d503b41cd9dfe..a300f645eccee1f529ed8dffb17de86a6c5de550 100644 (file)
--- a/src/AIModel/AIEscort.hxx
+++ b/src/AIModel/AIEscort.hxx
@@ -39,19 +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 setParentName(const std::string& p);
-    void setParentNode();
     void setStnRange(double r);
     void setStnBrg(double y);
     void setStationSpeed();
@@ -74,9 +71,7 @@ private:
 
     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);
 
     SGGeod _selectedpos;
     SGGeod _tgtpos;
@@ -96,11 +91,10 @@ private:
     double _max_speed;
 
     const SGMaterial* _material;
-    SGPropertyNode_ptr _selected_ac;
 
     bool _MPControl, _patrol, _stn_deg_true;
 
-    std::string _parent;
+//    std::string _parent;
 
 };