Merge branch 'next' into durk-atc

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

diff --git a/src/AIModel/AIAircraft.hxx b/src/AIModel/AIAircraft.hxx
index ea99462d8b5ff1b7984338f0501366e7f352acd4..3921bacc6439d2e92e6a48a0758f8a6a0ae7e378 100644 (file)
--- a/src/AIModel/AIAircraft.hxx
+++ b/src/AIModel/AIAircraft.hxx
@@ -76,6 +76,7 @@ public:
     void setTaxiClearanceRequest(bool arg) { needsTaxiClearance = arg; };
     bool getTaxiClearanceRequest() { return needsTaxiClearance; };
     FGAISchedule * getTrafficRef() { return trafficRef; };
+    void setTrafficRef(FGAISchedule *ref) { trafficRef = ref; };
 
     virtual const char* getTypeString(void) const { return "aircraft"; }
 
@@ -95,6 +96,8 @@ public:
     std::string atGate();
 
     void checkTcas();
+
+    FGATCController * getATCController() { return controller; };
     
 protected:
     void Run(double dt);
@@ -123,13 +126,13 @@ private:
     //subclasses to override specific behaviour
     bool fpExecutable(time_t now);
     void handleFirstWaypoint(void);
-    bool leadPointReached(FGAIFlightPlan::waypoint* curr);
-    bool handleAirportEndPoints(FGAIFlightPlan::waypoint* prev, time_t now);
+    bool leadPointReached(FGAIWaypoint* curr);
+    bool handleAirportEndPoints(FGAIWaypoint* prev, time_t now);
     bool reachedEndOfCruise(double&);
     bool aiTrafficVisible(void);
-    void controlHeading(FGAIFlightPlan::waypoint* curr);
-    void controlSpeed(FGAIFlightPlan::waypoint* curr,
-                      FGAIFlightPlan::waypoint* next);
+    void controlHeading(FGAIWaypoint* curr);
+    void controlSpeed(FGAIWaypoint* curr,
+                      FGAIWaypoint* next);
     
     void updatePrimaryTargetValues(bool& flightplanActive, bool& aiOutOfSight);