Fix a Clang warning, checking signed char as if it was unsigned.

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

diff --git a/src/AIModel/AIEscort.hxx b/src/AIModel/AIEscort.hxx
index d5adff5d53693c90096f8d91aa5cd5c1817c6655..380a92f28f5d6fd40b4737bd069fd9a5447bffb0 100644 (file)
--- a/src/AIModel/AIEscort.hxx
+++ b/src/AIModel/AIEscort.hxx
@@ -39,19 +39,15 @@ public:
     virtual ~FGAIEscort();
 
     virtual void readFromScenario(SGPropertyNode* scFileNode);
-    virtual void bind();
-    virtual void unbind();
-    virtual const char* getTypeString(void) const { return "escort"; }
 
     bool init(bool search_in_AI_path=false);
-
-private:
-
-    virtual void reinit() { init(); }
+    virtual void bind();
+    virtual void reinit();
     virtual void update (double dt);
 
-    void setParentName(const std::string& p);
-    void setParent();
+    virtual const char* getTypeString(void) const { return "escort"; }
+
+private:
     void setStnRange(double r);
     void setStnBrg(double y);
     void setStationSpeed();
@@ -61,6 +57,7 @@ private:
     void setStnHtFt(double h);
     void setStnPatrol(bool p);
     void setStnDegTrue(bool t);
+    void setParent();
 
     void setMaxSpeed(double m);
     void setUpdateInterval(double i);
@@ -73,9 +70,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;
@@ -95,11 +90,10 @@ private:
     double _max_speed;
 
     const SGMaterial* _material;
-    SGPropertyNode_ptr _selected_ac;
 
     bool _MPControl, _patrol, _stn_deg_true;
 
-    std::string _parent;
+//    std::string _parent;
 
 };