Merge branches 'jmt/xmlauto', 'luff/kln89' and 'curt/radial'

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

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index 2105a4a7310174ce783344d4f58153c80bdd6721..49639799a19de71d367330e0f201e5a64517dfb0 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;
 
@@ -63,17 +64,22 @@ public:
     
     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"; }
 
+    string GetTransponderCode() { return transponderCode; };
+    void SetTransponderCode(string tc) { transponderCode = tc;};
+
     // 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; };
@@ -82,6 +88,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);
@@ -95,6 +102,7 @@ private:
     double dt_count;
     double dt_elev_count;
     double headingChangeRate;
+    double headingError;
     double groundTargetSpeed;
     double groundOffset;
     double dt;
@@ -122,11 +130,13 @@ private:
     void updatePitchAngleTarget();
     void updateActualState();
     void handleATCRequests();
+    void checkVisibility();
 
     double sign(double x);
 
     string acType;
     string company;
+    string transponderCode;
 
     int spinCounter;
     double prevSpeed;
@@ -136,7 +146,10 @@ private:
 
     bool _getGearDown() const;
 
+    const char * _getTransponderCode() const;
+
     bool reachedWaypoint;
+    time_t timeElapsed;
 
     PerformanceData* _performance; // the performance data for this aircraft
 };