Fix for refueling and radar calculations.

[flightgear.git] / src / Airports / trafficcontrol.hxx

diff --git a/src/Airports/trafficcontrol.hxx b/src/Airports/trafficcontrol.hxx
index e0329a569d71d5c4b8ac46d85d9121bea67f1126..18aea60f3890444abf736d4b47a978637ad43487 100644 (file)
--- a/src/Airports/trafficcontrol.hxx
+++ b/src/Airports/trafficcontrol.hxx
@@ -101,7 +101,8 @@ public:
   virtual ~FGATCController() {};
   virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
                                double lat, double lon,
-                               double hdg, double spd, double alt, double radius, int leg) = 0;
+                               double hdg, double spd, double alt, double radius, int leg,
+                               string callsign) = 0;
   virtual void             signOff(int id) = 0;
   virtual void             update(int id, double lat, double lon, 
                                  double heading, double speed, double alt, double dt) = 0;
@@ -126,6 +127,7 @@ private:
   FGATCInstruction instruction;
   double latitude, longitude, heading, speed, altitude, radius;
   string runway;
+  string callsign;
   
   
 public:
@@ -144,6 +146,8 @@ public:
   int  crosses                   (FGGroundNetwork *, FGTrafficRecord &other); 
   bool isOpposing                (FGGroundNetwork *, FGTrafficRecord &other, int node);
 
+  bool onRoute(FGGroundNetwork *, FGTrafficRecord &other);
+
   bool getSpeedAdjustment() { return instruction.getChangeSpeed(); };
   
   double getLatitude () { return latitude ; };
@@ -167,7 +171,8 @@ public:
   void setWaitsForId(int id) { waitsForId = id; };
 
   string getRunway() { return runway; };
-
+  void setCallSign(string clsgn) { callsign = clsgn; };
+  string getCallSign() { return callsign; };
 };
 
 typedef vector<FGTrafficRecord> TrafficVector;
@@ -206,7 +211,8 @@ public:
   virtual ~FGTowerController() {};
   virtual void announcePosition(int id, FGAIFlightPlan *intendedRoute, int currentRoute,
                                double lat, double lon,
-                               double hdg, double spd, double alt, double radius, int leg);
+                               double hdg, double spd, double alt, double radius, int leg,
+                               string callsign);
   virtual void             signOff(int id);
   virtual void             update(int id, double lat, double lon, 
                                  double heading, double speed, double alt, double dt);