Merge branch 'vivian/cullsetting'

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

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index fd4fd2ad0813c2423006304b6ef6ccc4c823a613..7e65d0df51294732c4543a3dcff5c4461fc50f54 100644 (file)
--- a/src/AIModel/AIAircraft.hxx
+++ b/src/AIModel/AIAircraft.hxx
@@ -29,7 +29,6 @@
 #include <ATC/trafficcontrol.hxx>
 
 #include <string>
-using std::string;
 
 class PerformanceData;
 
@@ -66,15 +65,20 @@ public:
     void doGroundAltitude();
     bool loadNextLeg  ();
 
-    void setAcType(const string& ac) { acType = ac; };
-    void setCompany(const string& comp) { company = comp;};
+    void setAcType(const std::string& ac) { acType = ac; };
+    void setCompany(const std::string& comp) { company = comp;};
 
     void announcePositionToController(); //TODO have to be public?
     void processATC(FGATCInstruction instruction);
+    void setTaxiClearanceRequest(bool arg) { needsTaxiClearance = arg; };
+    bool getTaxiClearanceRequest() { return needsTaxiClearance; };
     FGAISchedule * getTrafficRef() { return trafficRef; };
 
     virtual const char* getTypeString(void) const { return "aircraft"; }
 
+    std::string GetTransponderCode() { return transponderCode; };
+    void SetTransponderCode(const std::string& tc) { transponderCode = tc;};
+
     // included as performance data needs them, who else?
     inline PerformanceData* getPerformance() { return _performance; };
     inline bool onGround() const { return no_roll; };
@@ -85,7 +89,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();
+    std::string atGate();
     
 protected:
     void Run(double dt);
@@ -118,7 +122,9 @@ private:
     void controlHeading(FGAIFlightPlan::waypoint* curr);
     void controlSpeed(FGAIFlightPlan::waypoint* curr,
                       FGAIFlightPlan::waypoint* next);
-    void updatePrimaryTargetValues();
+    
+    void updatePrimaryTargetValues(bool& flightplanActive, bool& aiOutOfSight);
+    
     void updateSecondaryTargetValues();
     void updatePosition();
     void updateHeading();
@@ -131,8 +137,9 @@ private:
 
     double sign(double x);
 
-    string acType;
-    string company;
+    std::string acType;
+    std::string company;
+    std::string transponderCode;
 
     int spinCounter;
     double prevSpeed;
@@ -142,7 +149,10 @@ private:
 
     bool _getGearDown() const;
 
+    const char * _getTransponderCode() const;
+
     bool reachedWaypoint;
+    bool needsTaxiClearance;
     time_t timeElapsed;
 
     PerformanceData* _performance; // the performance data for this aircraft