Merge branch 'topic/gcintersect' into next

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

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index b70c1ea6244a0a2bb58a450d8096695b7ba297fb..fd4fd2ad0813c2423006304b6ef6ccc4c823a613 100644 (file)
--- a/src/AIModel/AIAircraft.hxx
+++ b/src/AIModel/AIAircraft.hxx
@@ -26,9 +26,10 @@
 
 #include <Traffic/SchedFlight.hxx>
 #include <Traffic/Schedule.hxx>
+#include <ATC/trafficcontrol.hxx>
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 
 class PerformanceData;
 
@@ -61,21 +62,21 @@ public:
     void ClimbTo(double altitude);
     void TurnTo(double heading);
     
-    void setCallSign(const string& );
-
     void getGroundElev(double dt); //TODO these 3 really need to be public?
     void doGroundAltitude();
-    void loadNextLeg  ();
+    bool loadNextLeg  ();
 
     void setAcType(const string& ac) { acType = ac; };
     void setCompany(const string& comp) { company = comp;};
 
     void announcePositionToController(); //TODO have to be public?
     void processATC(FGATCInstruction instruction);
+    FGAISchedule * getTrafficRef() { return trafficRef; };
 
     virtual const char* getTypeString(void) const { return "aircraft"; }
 
     // included as performance data needs them, who else?
+    inline PerformanceData* getPerformance() { return _performance; };
     inline bool onGround() const { return no_roll; };
     inline double getSpeed() const { return speed; };
     inline double getRoll() const { return roll; };
@@ -84,6 +85,7 @@ public:
     inline double getVerticalSpeed() const { return vs; };
     inline double altitudeAGL() const { return props->getFloatValue("position/altitude-agl-ft");};
     inline double airspeed() const { return props->getFloatValue("velocities/airspeed-kt");};
+    string atGate();
     
 protected:
     void Run(double dt);
@@ -97,6 +99,7 @@ private:
     double dt_count;
     double dt_elev_count;
     double headingChangeRate;
+    double headingError;
     double groundTargetSpeed;
     double groundOffset;
     double dt;
@@ -124,6 +127,7 @@ private:
     void updatePitchAngleTarget();
     void updateActualState();
     void handleATCRequests();
+    void checkVisibility();
 
     double sign(double x);
 
@@ -137,8 +141,9 @@ private:
     bool holdPos;
 
     bool _getGearDown() const;
+
     bool reachedWaypoint;
-    string callsign;             // The callsign of this tanker.
+    time_t timeElapsed;
 
     PerformanceData* _performance; // the performance data for this aircraft
 };