initialize release_keys array

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

diff --git a/src/Airports/trafficcontrol.cxx b/src/Airports/trafficcontrol.cxx
index aaa971d38db132d86b2095a4a190e424c5cfbb90..7489b2c016d5ac058b31fe83f3195f97e36f100c 100644 (file)
--- a/src/Airports/trafficcontrol.cxx
+++ b/src/Airports/trafficcontrol.cxx
@@ -31,6 +31,18 @@
 /***************************************************************************
  * FGTrafficRecord
  **************************************************************************/
+FGTrafficRecord::FGTrafficRecord() :
+  id(0), waitsForId(0),
+  currentPos(0),
+  leg(0),
+  latitude(0),
+  longitude(0), 
+   heading(0), 
+   speed(0), 
+   altitude(0), 
+   radius(0) {
+}
+
 void FGTrafficRecord::setPositionAndIntentions(int pos, FGAIFlightPlan *route)
 {
  
@@ -300,6 +312,7 @@ FGATCInstruction::FGATCInstruction()
   changeSpeed    = false;
   changeHeading  = false;
   changeAltitude = false;
+  resolveCircularWait = false;
 
   double speed   = 0;
   double heading = 0;
@@ -308,7 +321,7 @@ FGATCInstruction::FGATCInstruction()
 
 bool FGATCInstruction::hasInstruction()
 {
-  return (holdPattern || holdPosition || changeSpeed || changeHeading || changeAltitude);
+  return (holdPattern || holdPosition || changeSpeed || changeHeading || changeAltitude || resolveCircularWait);
 }
 
 
@@ -345,6 +358,7 @@ void FGTowerController::announcePosition(int id, FGAIFlightPlan *intendedRoute,
   if (i == activeTraffic.end() || (activeTraffic.size() == 0)) {
     FGTrafficRecord rec;
     rec.setId(id);
+
     rec.setPositionAndHeading(lat, lon, heading, speed, alt);
     rec.setRunway(intendedRoute->getRunway());
     rec.setLeg(leg);