]> git.mxchange.org Git - flightgear.git/blobdiff - src/ATC/tower.cxx
I had hoped that gmtime's lack of thread-safety wouldn't bite us. It does.
[flightgear.git] / src / ATC / tower.cxx
index ea90860eba95a5762ee7ea1b2cc519cdd1149ccc..1271e920a1b1ee85cd1bad46d53b1410158d82c6 100644 (file)
@@ -58,6 +58,7 @@ TowerPlaneRec::TowerPlaneRec() :
        finalAcknowledged(false),
        rwyVacatedReported(false),
        rwyVacatedAcknowledged(false),
+       goAroundReported(false),
        instructedToGoAround(false),
        onRwy(false),
        nextOnRwy(false),
@@ -84,6 +85,7 @@ TowerPlaneRec::TowerPlaneRec(PlaneRec p) :
        finalAcknowledged(false),
        rwyVacatedReported(false),
        rwyVacatedAcknowledged(false),
+       goAroundReported(false),
        instructedToGoAround(false),
        onRwy(false),
        nextOnRwy(false),
@@ -110,6 +112,7 @@ TowerPlaneRec::TowerPlaneRec(Point3D pt) :
        finalAcknowledged(false),
        rwyVacatedReported(false),
        rwyVacatedAcknowledged(false),
+       goAroundReported(false),
        instructedToGoAround(false),
        onRwy(false),
        nextOnRwy(false),
@@ -137,6 +140,7 @@ TowerPlaneRec::TowerPlaneRec(PlaneRec p, Point3D pt) :
        finalAcknowledged(false),
        rwyVacatedReported(false),
        rwyVacatedAcknowledged(false),
+       goAroundReported(false),
        instructedToGoAround(false),
        onRwy(false),
        nextOnRwy(false),
@@ -168,8 +172,6 @@ will break when planes start queueing. (CRITICAL)
 
 Report-Runway-Vacated is left as only user ATC option following a go-around. (MAJOR)
 
-Report Go-Around should be added to user options following reporting final or downwind. (MEDIUM).
-
 Report-Downwind is not added as ATC option when user takes off to fly a circuit. (MAJOR)
 
 eta of USER can be calculated very wrongly in circuit if flying straight out and turn4 etc are with +ve ortho y. 
@@ -183,6 +185,10 @@ GetPos() of the AI planes is called erratically - either too much or not enough.
 GO-AROUND is instructed very late at < 12s to landing - possibly make more dependent on chance of rwy clearing before landing (FEATURE)
 
 Need to make clear when TowerPlaneRecs do or don't get deleted in RemoveFromCircuitList etc. (MINOR until I misuse it - then CRITICAL!)
+
+FGTower::RemoveAllUserDialogOptions() really ought to be replaced by an ATCDialog::clear_entries() function. (MINOR - efficiency).
+
+At the moment planes in the lists are not guaranteed to always have a sensible ETA - it should be set as part of AddList functions, and lists should only be accessed this way. (FAIRLY MAJOR). 
 *******************************************/
 
 FGTower::FGTower() {
@@ -227,7 +233,6 @@ FGTower::~FGTower() {
 
 void FGTower::Init() {
        //cout << "Initialising tower " << ident << '\n';
-    display = false;
        
        // Pointers to user's position
        user_lon_node = fgGetNode("/position/longitude-deg", true);
@@ -252,7 +257,7 @@ void FGTower::Init() {
                                ground = new FGGround(ident);
                                separateGround = false;
                                ground->Init();
-                               if(display) {
+                               if(_display) {
                                        ground->SetDisplay();
                                } else {
                                        ground->SetNoDisplay();
@@ -264,7 +269,7 @@ void FGTower::Init() {
                        ground = new FGGround(ident);
                        separateGround = false;
                        ground->Init();
-                       if(display) {
+                       if(_display) {
                                ground->SetDisplay();
                        } else {
                                ground->SetNoDisplay();
@@ -276,7 +281,7 @@ void FGTower::Init() {
                ground = new FGGround(ident);
                separateGround = false;
                ground->Init();
-               if(display) {
+               if(_display) {
                        ground->SetDisplay();
                } else {
                        ground->SetNoDisplay();
@@ -312,6 +317,7 @@ void FGTower::Init() {
                // For now assume that this means the user is not at the airport and is in the air.
                // TODO FIXME - this will break when user starts on apron, at hold short, etc.
                if(!OnAnyRunway(Point3D(user_lon_node->getDoubleValue(), user_lat_node->getDoubleValue(), 0.0))) {
+                       //cout << ident << "  ADD 0\n";
                        current_atcdialog->add_entry(ident, "@AP Tower @CS @MI miles @CD of the airport for full stop with the ATIS", "Contact tower for VFR arrival (full stop)", TOWER, (int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP);
                }
        }
@@ -402,7 +408,8 @@ void FGTower::Update(double dt) {
                // The display stuff might have to get more clever than this when not separate 
                // since the tower and ground might try communicating simultaneously even though
                // they're mean't to be the same contoller/frequency!!
-               if(display) {
+               // We could also get rid of this by overloading FGATC's Set(No)Display() functions.
+               if(_display) {
                        ground->SetDisplay();
                } else {
                        ground->SetNoDisplay();
@@ -419,6 +426,7 @@ void FGTower::Update(double dt) {
        // Call the base class update for the response time handling.
        FGATC::Update(dt);
 
+       /*
        if(ident == "KEMT") {   
                // For AI debugging convienience - may be removed
                Point3D user_pos;
@@ -430,6 +438,7 @@ void FGTower::Update(double dt) {
                fgSetDouble("/AI/user/ortho-y", user_ortho_pos.y());
                fgSetDouble("/AI/user/elev", user_elev_node->getDoubleValue());
        }
+       */
        
        //cout << "Done T" << endl;
 }
@@ -450,9 +459,13 @@ void FGTower::ReceiveUserCallback(int code) {
                ReportFinal("USER");
        } else if(code == (int)USER_REPORT_RWY_VACATED) {
                ReportRunwayVacated("USER");
+       } else if(code == (int)USER_REPORT_GOING_AROUND) {
+               ReportGoingAround("USER");
        }
 }
 
+// **************** RESPONSE FUNCTIONS ****************
+
 void FGTower::Respond() {
        //cout << "\nEntering Respond, responseID = " << responseID << endl;
        TowerPlaneRec* t = FindPlane(responseID);
@@ -494,37 +507,18 @@ void FGTower::Respond() {
                                }
                        }
                        trns += ConvertRwyNumToSpokenString(activeRwy);
-                       if(display) {
-                               globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+                       if(_display) {
+                               //globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+                               pending_transmission = trns;
+                               Transmit();
                        } else {
                                //cout << "Not displaying, trns was " << trns << '\n';
                        }
                        t->vfrArrivalAcknowledged = true;
                } else if(t->downwindReported) {
                        //cout << "Tower " << ident << " is responding to downwind reported...\n";
+                       ProcessDownwindReport(t);
                        t->downwindReported = false;
-                       int i = 1;
-                       for(tower_plane_rec_list_iterator twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
-                               if((*twrItr)->plane.callsign == responseID) break;
-                               ++i;
-                       }
-                       string trns = t->plane.callsign;
-                       trns += " Number ";
-                       trns += ConvertNumToSpokenDigits(i);
-                       trns += " ";
-                       if((i == 1) && (!rwyList.size()) && (t->nextOnRwy)) {
-                               trns += "Cleared to land";      // TODO - clear for the option if appropriate
-                               t->clearedToLand = true;
-                               if(!t->isUser) t->planePtr->RegisterTransmission(7);
-                       }
-                       if(display) {
-                               globals->get_ATC_display()->RegisterSingleMessage(trns);
-                       }
-                       if(t->isUser) {
-                               if(t->opType == TTT_UNKNOWN) t->opType = CIRCUIT;
-                               current_atcdialog->add_entry(ident, "@CS Clear of the runway", "Report runway vacated", TOWER, USER_REPORT_RWY_VACATED);
-                               // TODO - add report going around as an option
-                       }
                } else if(t->holdShortReported) {
                        //cout << "Tower " << ident << " is reponding to holdShortReported...\n";
                        if(t->nextOnRwy) {
@@ -550,8 +544,10 @@ void FGTower::Respond() {
                                // Not currently sure under which circumstances we do or don't bother transmitting this.
                                string trns = t->plane.callsign;
                                trns += " hold position";
-                               if(display) {
-                                       globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+                               if(_display) {
+                                       //globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+                                       pending_transmission = trns;
+                                       Transmit();
                                }
                                // TODO - add some idea of what traffic is blocking him.
                        }
@@ -572,8 +568,11 @@ void FGTower::Respond() {
                                t->clearedToLand = true;
                                // Maybe remove report downwind from menu here as well incase user didn't bother to?
                                if(t->isUser) {
+                                       //cout << "ADD VACATED B\n";
+                                       // Put going around at the top (and hence default) since that'll be more desperate,
+                                       // or put rwy vacated at the top since that'll be more common?
+                                       current_atcdialog->add_entry(ident, "@CS Going Around", "Report going around", TOWER, USER_REPORT_GOING_AROUND);
                                        current_atcdialog->add_entry(ident, "@CS Clear of the runway", "Report runway vacated", TOWER, USER_REPORT_RWY_VACATED);
-                                       // TODO - add report going around as an option.
                                } else {
                                        t->planePtr->RegisterTransmission(7);
                                }
@@ -585,8 +584,10 @@ void FGTower::Respond() {
                                trns += " continue approach";
                                t->clearedToLand = false;
                        }
-                       if(display && disp) {
-                               globals->get_ATC_display()->RegisterSingleMessage(trns);
+                       if(_display && disp) {
+                               //globals->get_ATC_display()->RegisterSingleMessage(trns);
+                               pending_transmission = trns;
+                               Transmit();
                        }
                        t->finalAcknowledged = true;
                } else if(t->rwyVacatedReported && !(t->rwyVacatedAcknowledged)) {
@@ -601,8 +602,104 @@ void FGTower::Respond() {
        //cout << "Done Respond\n" << endl;
 }
 
+void FGTower::ProcessDownwindReport(TowerPlaneRec* t) {
+       int i = 1;
+       int a = 0;      // Count of preceding planes on approach
+       bool cf = false;        // conflicting traffic on final
+       bool cc = false;        // preceding traffic in circuit
+       TowerPlaneRec* tc = NULL;
+       for(tower_plane_rec_list_iterator twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
+               if((*twrItr)->plane.callsign == responseID) break;
+               tc = *twrItr;
+               ++i;
+       }
+       if(i > 1) { cc = true; }
+       doThresholdETACalc();
+       TowerPlaneRec* tf = NULL;
+       for(tower_plane_rec_list_iterator twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
+               if((*twrItr)->eta < (t->eta + 45)) {
+                       a++;
+                       tf = *twrItr;
+                       cf = true;
+                       // This should set the flagged plane to be the last conflicting one, and hence the one to follow.
+                       // It ignores the fact that we might have problems slotting into the approach traffic behind it - 
+                       // eventually we'll need some fancy algorithms for that!
+               }
+       }
+       string trns = t->plane.callsign;
+       trns += " Number ";
+       trns += ConvertNumToSpokenDigits(i + a);
+       // This assumes that the number spoken is landing position, not circuit position, since some of the traffic might be on straight-in final.
+       trns += " ";
+       TowerPlaneRec* tt = NULL;
+       if((i == 1) && (!rwyList.size()) && (t->nextOnRwy) && (!cf)) {  // Unfortunately nextOnRwy currently doesn't handle circuit/straight-in ordering properly at present, hence the cf check below.
+               trns += "Cleared to land";      // TODO - clear for the option if appropriate
+               t->clearedToLand = true;
+               if(!t->isUser) t->planePtr->RegisterTransmission(7);
+       } else if((i+a) > 1) {
+               //First set tt to point to the correct preceding plane - final or circuit
+               if(tc && tf) {
+                       tt = (tf->eta < tc->eta ? tf : tc);
+               } else if(tc) {
+                       tt = tc;
+               } else if(tf) {
+                       tt = tf;
+               } else {
+                       // We should never get here!
+                       SG_LOG(SG_ATC, SG_ALERT, "ALERT - Logic error in FGTower::ProcessDownwindReport");
+                       return;
+               }
+               trns += "Follow the ";
+               string s = tt->plane.callsign;
+               int p = s.find('-');
+               s = s.substr(0,p);
+               trns += s;
+               if((tt->opType) == CIRCUIT) {
+                       PatternLeg leg;
+                       if(t->isUser) {
+                               leg = tt->leg;
+                       } else {
+                               leg = tt->planePtr->GetLeg();
+                       }
+                       if(leg == FINAL) {
+                               trns += " on final";
+                       } else if(leg == TURN4) {
+                               trns += " turning final";
+                       } else if(leg == BASE) {
+                               trns += " on base";
+                       } else if(leg == TURN3) {
+                               trns += " turning base";
+                       }
+               } else {
+                       double miles_out = CalcDistOutMiles(tt);
+                       if(miles_out < 2) {
+                               trns += " on short final";
+                       } else {
+                               trns += " on ";
+                               trns += ConvertNumToSpokenDigits((int)miles_out);
+                               trns += " mile final";
+                       }
+               }
+       }
+       if(_display) {
+               //globals->get_ATC_display()->RegisterSingleMessage(trns);
+               pending_transmission = trns;
+               Transmit();
+       }
+       if(t->isUser) {
+               if(t->opType == TTT_UNKNOWN) t->opType = CIRCUIT;
+               //cout << "ADD VACATED A\n";
+               // Put going around at the top (and hence default) since that'll be more desperate,
+               // or put rwy vacated at the top since that'll be more common?
+               //cout << "ident = " << ident << ", adding go-around option\n";
+               current_atcdialog->add_entry(ident, "@CS Going Around", "Report going around", TOWER, USER_REPORT_GOING_AROUND);
+               current_atcdialog->add_entry(ident, "@CS Clear of the runway", "Report runway vacated", TOWER, USER_REPORT_RWY_VACATED);
+       }
+}
+
 void FGTower::ProcessRunwayVacatedReport(TowerPlaneRec* t) {
        //cout << "Processing rwy vacated...\n";
+       if(t->isUser) current_atcdialog->remove_entry(ident, USER_REPORT_GOING_AROUND, TOWER);
        string trns = t->plane.callsign;
        if(separateGround) {
                trns += " Contact ground on ";
@@ -618,12 +715,18 @@ void FGTower::ProcessRunwayVacatedReport(TowerPlaneRec* t) {
                if(!t->isUser) t->planePtr->RegisterTransmission(6);    // TODO - this is a mega-hack!!
        }
        //cout << "trns = " << trns << '\n';
-       if(display) {
-               globals->get_ATC_display()->RegisterSingleMessage(trns);
+       if(_display) {
+               //globals->get_ATC_display()->RegisterSingleMessage(trns);
+               pending_transmission = trns;
+               Transmit();
        }
+       RemoveFromRwyList(t->plane.callsign);
+       AddToVacatedList(t);
        // Maybe we should check that the plane really *has* vacated the runway!
 }
 
+// *********** END RESPONSE FUNCTIONS *****************
+
 // Currently this assumes we *are* next on the runway and doesn't check for planes about to land - 
 // this should be done prior to calling this function.
 void FGTower::ClearHoldingPlane(TowerPlaneRec* t) {
@@ -725,8 +828,10 @@ void FGTower::ClearHoldingPlane(TowerPlaneRec* t) {
                departed = false;
                timeSinceLastDeparture = 0.0;
        }
-       if(display) {
-               globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+       if(_display) {
+               //globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+               pending_transmission = trns;
+               Transmit();
        }
        //cout << "Done ClearHoldingPlane " << endl;
 }
@@ -805,7 +910,7 @@ void FGTower::CheckCircuitList(double dt) {
                        //cout << " ho = " << ho << " abs(ho = " << abs(ho) << '\n';
                        // TODO FIXME - get the wind and convert this to track, or otherwise use track somehow!!!
                        // If it's gusty might need to filter the value, although we are leaving 30 degrees each way leeway!
-                       if(abs(ho) < 30) {
+                       if(fabs(ho) < 30) {
                                // could be either takeoff, climbout or landing - check orthopos.y
                                //cout << "tortho.y = " << tortho.y() << '\n';
                                if((tortho.y() < 0) || (t->leg == TURN4) || (t->leg == FINAL)) {
@@ -838,7 +943,7 @@ void FGTower::CheckCircuitList(double dt) {
                                                }
                                        }
                                }
-                       } else if(abs(ho) < 60) {
+                       } else if(fabs(ho) < 60) {
                                // turn1 or turn 4
                                // TODO - either fix or doublecheck this hack by looking at heading and pattern direction
                                if((t->leg == CLIMBOUT) || (t->leg == TURN1)) {
@@ -848,7 +953,7 @@ void FGTower::CheckCircuitList(double dt) {
                                        t->leg = TURN4;
                                        //cout << "Turn4\n";
                                }
-                       } else if(abs(ho) < 120) {
+                       } else if(fabs(ho) < 120) {
                                // crosswind or base
                                // TODO - either fix or doublecheck this hack by looking at heading and pattern direction
                                if((t->leg == TURN1) || (t->leg == CROSSWIND)) {
@@ -858,7 +963,7 @@ void FGTower::CheckCircuitList(double dt) {
                                        t->leg = BASE;
                                        //cout << "Base\n";
                                }
-                       } else if(abs(ho) < 150) {
+                       } else if(fabs(ho) < 150) {
                                // turn2 or turn 3
                                // TODO - either fix or doublecheck this hack by looking at heading and pattern direction
                                if((t->leg == CROSSWIND) || (t->leg == TURN2)) {
@@ -934,29 +1039,61 @@ void FGTower::CheckCircuitList(double dt) {
                }
                
                if(t->leg == FINAL && !(t->instructedToGoAround)) {
+                       doThresholdETACalc();
+                       doThresholdUseOrder();
+                       /*
+                       if(t->isUser) {
+                               cout << "Checking USER on final... ";
+                               cout << "eta " << t->eta;
+                               if(t->clearedToLand) cout << " cleared to land\n";
+                       }
+                       */
                        //cout << "YES FINAL, t->eta = " << t->eta << ", rwyList.size() = " << rwyList.size() << '\n';
                        if(t->landingType == FULL_STOP) {
                                t->opType = INBOUND;
                                //cout << "\n******** SWITCHING TO INBOUND AT POINT AAA *********\n\n";
-                               if(t->eta < 12 && rwyList.size()) {
-                                       // TODO - need to make this more sophisticated 
-                                       // eg. is the plane accelerating down the runway taking off [OK],
-                                       // or stationary near the start [V. BAD!!].
-                                       // For now this should stop the AI plane landing on top of the user.
-                                       string trns = t->plane.callsign;
-                                       trns += " GO AROUND TRAFFIC ON RUNWAY I REPEAT GO AROUND";
-                                       if(display) {
-                                               globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
+                       }
+                       if(t->eta < 12 && rwyList.size()) {
+                               // TODO - need to make this more sophisticated 
+                               // eg. is the plane accelerating down the runway taking off [OK],
+                               // or stationary near the start [V. BAD!!].
+                               // For now this should stop the AI plane landing on top of the user.
+                               string trns = t->plane.callsign;
+                               trns += " GO AROUND TRAFFIC ON RUNWAY I REPEAT GO AROUND";
+                               pending_transmission = trns;
+                               ImmediateTransmit();
+                               t->instructedToGoAround = true;
+                               t->clearedToLand = false;
+                               // Assume it complies!!!
+                               t->opType = CIRCUIT;
+                               t->leg = CLIMBOUT;
+                               if(t->planePtr) {
+                                       //cout << "Registering Go-around transmission with AI plane\n";
+                                       t->planePtr->RegisterTransmission(13);
+                               }
+                       } else if(!t->clearedToLand) {
+                               // The whip through the appList is a hack since currently t->nextOnRwy doesn't always work
+                               // TODO - fix this!
+                               bool cf = false;
+                               for(tower_plane_rec_list_iterator twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
+                                       if((*twrItr)->eta < t->eta) {
+                                               cf = true;
                                        }
-                                       t->instructedToGoAround = true;
-                                       t->clearedToLand = false;
-                                       // Assume it complies!!!
-                                       t->opType = CIRCUIT;
-                                       t->leg = CLIMBOUT;
-                                       if(t->planePtr) {
-                                               //cout << "Registering Go-around transmission with AI plane\n";
-                                               t->planePtr->RegisterTransmission(13);
+                               }
+                               if(t->nextOnRwy && !cf) {
+                                       if(!rwyList.size()) {
+                                               string trns = t->plane.callsign;
+                                               trns += " Cleared to land";
+                                               pending_transmission = trns;
+                                               Transmit();
+                                               //if(t->isUser) cout << "Transmitting cleared to Land!!!\n";
+                                               t->clearedToLand = true;
+                                               if(!t->isUser) {
+                                                       t->planePtr->RegisterTransmission(7);
+                                               }
                                        }
+                               } else {
+                                       //if(t->isUser) cout << "Not next\n";
                                }
                        }
                } else if(t->leg == LANDING_ROLL) {
@@ -1006,7 +1143,7 @@ void FGTower::CheckRunwayList(double dt) {
                                        //cout << "Size of rwylist was " << rwyList.size() << '\n';
                                        //cout << "Size of vacatedList was " << vacatedList.size() << '\n';
                                        RemoveFromRwyList(t->plane.callsign);
-                                       vacatedList.push_back(t);
+                                       AddToVacatedList(t);
                                        //cout << "Size of rwylist is " << rwyList.size() << '\n';
                                        //cout << "Size of vacatedList is " << vacatedList.size() << '\n';
                                        // At the moment we wait until Runway Vacated is reported by the plane before telling to contact ground etc.
@@ -1058,6 +1195,7 @@ void FGTower::CheckApproachList(double dt) {
                } else {
                        // TODO - set/update the position if it's an AI plane
                }
+               doThresholdETACalc();   // We need this here because planes in the lists are not guaranteed to *always* have the correct ETA
                //cout << "eta is " << t->eta << ", rwy is " << (rwyList.size() ? "occupied " : "clear ") << '\n';
                if(t->eta < 12 && rwyList.size() && !(t->instructedToGoAround)) {
                        // TODO - need to make this more sophisticated 
@@ -1066,9 +1204,8 @@ void FGTower::CheckApproachList(double dt) {
                        // For now this should stop the AI plane landing on top of the user.
                        string trns = t->plane.callsign;
                        trns += " GO AROUND TRAFFIC ON RUNWAY I REPEAT GO AROUND";
-                       if(display) {
-                               globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
-                       }
+                       pending_transmission = trns;
+                       ImmediateTransmit();
                        t->instructedToGoAround = true;
                        t->clearedToLand = false;
                        t->nextOnRwy = false;   // But note this is recalculated so don't rely on it
@@ -1084,10 +1221,32 @@ void FGTower::CheckApproachList(double dt) {
                                // TODO - add Go-around ack to comm options,
                                // remove report rwy vacated. (possibly).
                        }
-               }                               
-               if(t->nextOnRwy && !(t->clearedToLand) && !(t->instructedToGoAround)) {
-                       // check distance away and whether runway occupied
-                       // and schedule transmission if necessary
+               } else if(t->eta < 90 && !t->clearedToLand) {
+                       //doThresholdETACalc();
+                       doThresholdUseOrder();
+                       // The whip through the appList is a hack since currently t->nextOnRwy doesn't always work
+                       // TODO - fix this!
+                       bool cf = false;
+                       for(tower_plane_rec_list_iterator twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
+                               if((*twrItr)->eta < t->eta) {
+                                       cf = true;
+                               }
+                       }
+                       if(t->nextOnRwy && !cf) {
+                               if(!rwyList.size()) {
+                                       string trns = t->plane.callsign;
+                                       trns += " Cleared to land";
+                                       pending_transmission = trns;
+                                       Transmit();
+                                       //if(t->isUser) cout << "Transmitting cleared to Land!!!\n";
+                                       t->clearedToLand = true;
+                                       if(!t->isUser) {
+                                               t->planePtr->RegisterTransmission(7);
+                                       }
+                               }
+                       } else {
+                               //if(t->isUser) cout << "Not next\n";
+                       }
                }
                
                // Check for landing...
@@ -1143,12 +1302,12 @@ void FGTower::CheckDepartureList(double dt) {
                if(distout > 10000) {
                        string trns = t->plane.callsign;
                        trns += " You are now clear of my airspace, good day";
-                       if(display) {
-                               globals->get_ATC_display()->RegisterSingleMessage(trns, 0);
-                       }
+                       pending_transmission = trns;
+                       Transmit();
                        if(t->isUser) {
                                // Change the communication options
                                RemoveAllUserDialogOptions();
+                               //cout << "ADD A\n";
                                current_atcdialog->add_entry(ident, "@AP Tower @CS @MI miles @CD of the airport for full stop with the ATIS", "Contact tower for VFR arrival (full stop)", TOWER, (int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP);
                        } else {
                                // Send a clear-of-airspace signal
@@ -1226,26 +1385,26 @@ void FGTower::DoRwyDetails() {
        bool rwyGood = globals->get_runways()->search(ident, int(hdg), &runway);
        if(rwyGood) {
                //cout << "RUNWAY GOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOD\n";
-               activeRwy = runway.rwy_no;
-               rwy.rwyID = runway.rwy_no;
+               activeRwy = runway._rwy_no;
+               rwy.rwyID = runway._rwy_no;
                SG_LOG(SG_ATC, SG_INFO, "Active runway for airport " << ident << " is " << activeRwy);
                
                // Get the threshold position
-               double other_way = runway.heading - 180.0;
+               double other_way = runway._heading - 180.0;
                while(other_way <= 0.0) {
                        other_way += 360.0;
                }
        // move to the +l end/center of the runway
-               //cout << "Runway center is at " << runway.lon << ", " << runway.lat << '\n';
-       Point3D origin = Point3D(runway.lon, runway.lat, aptElev);
+               //cout << "Runway center is at " << runway._lon << ", " << runway._lat << '\n';
+       Point3D origin = Point3D(runway._lon, runway._lat, aptElev);
                Point3D ref = origin;
        double tshlon, tshlat, tshr;
                double tolon, tolat, tor;
-               rwy.length = runway.length * SG_FEET_TO_METER;
-               rwy.width = runway.width * SG_FEET_TO_METER;
+               rwy.length = runway._length * SG_FEET_TO_METER;
+               rwy.width = runway._width * SG_FEET_TO_METER;
        geo_direct_wgs_84 ( aptElev, ref.lat(), ref.lon(), other_way, 
                                rwy.length / 2.0 - 25.0, &tshlat, &tshlon, &tshr );
-       geo_direct_wgs_84 ( aptElev, ref.lat(), ref.lon(), runway.heading, 
+       geo_direct_wgs_84 ( aptElev, ref.lat(), ref.lon(), runway._heading, 
                                rwy.length / 2.0 - 25.0, &tolat, &tolon, &tor );
                // Note - 25 meters in from the runway end is a bit of a hack to put the plane ahead of the user.
                // now copy what we need out of runway into rwy
@@ -1253,7 +1412,7 @@ void FGTower::DoRwyDetails() {
                Point3D takeoff_end = Point3D(tolon, tolat, aptElev);
                //cout << "Threshold position = " << tshlon << ", " << tshlat << ", " << aptElev << '\n';
                //cout << "Takeoff position = " << tolon << ", " << tolat << ", " << aptElev << '\n';
-               rwy.hdg = runway.heading;
+               rwy.hdg = runway._heading;
                // Set the projection for the local area based on this active runway
                ortho.Init(rwy.threshold_pos, rwy.hdg); 
                rwy.end1ortho = ortho.ConvertToLocal(rwy.threshold_pos);        // should come out as zero
@@ -1312,9 +1471,9 @@ bool FGTower::OnAnyRunway(Point3D pt) {
                SG_LOG(SG_ATC, SG_WARN, "Unable to find any runways for airport ID " << ad.ident << " in FGTower");
        }
        bool on = false;
-       while(runway.id == ad.ident) {          
+       while(runway._id == ad.ident) {         
                on = OnRunway(pt, runway);
-               //cout << "Runway " << runway.rwy_no << ": On = " << (on ? "true\n" : "false\n");
+               //cout << "Runway " << runway._rwy_no << ": On = " << (on ? "true\n" : "false\n");
                if(on) return(true);
                globals->get_runways()->next(&runway);          
        }
@@ -1438,6 +1597,8 @@ bool FGTower::AddToTrafficList(TowerPlaneRec* t, bool holding) {
        if(!trafficList.size()) {
                t->nextOnRwy = true;
                // conflict and firstTime should be false and true respectively in this case anyway.
+       } else {
+               t->nextOnRwy = false;
        }
        trafficList.push_back(t);
        //cout << "\tE\t" << trafficList.size() << endl;
@@ -1496,6 +1657,19 @@ bool FGTower::AddToCircuitList(TowerPlaneRec* t) {
        return(conflict);
 }
 
+// Add to vacated list only if not already present
+void FGTower::AddToVacatedList(TowerPlaneRec* t) {
+       tower_plane_rec_list_iterator twrItr;
+       bool found = false;
+       for(twrItr = vacatedList.begin(); twrItr != vacatedList.end(); twrItr++) {
+               if((*twrItr)->plane.callsign == t->plane.callsign) {
+                       found = true;
+               }
+       }
+       if(found) return;
+       vacatedList.push_back(t);
+}
+
 
 // Calculate the eta of a plane to the threshold.
 // For ground traffic this is the fastest they can get there.
@@ -1673,15 +1847,17 @@ bool FGTower::doThresholdUseOrder() {
        
        tower_plane_rec_list_iterator twrItr;
        // Do the approach list first
-       //cout << "A" << flush;
+       //if(ident == "KRHV") cout << "A" << flush;
        for(twrItr = appList.begin(); twrItr != appList.end(); twrItr++) {
                TowerPlaneRec* tpr = *twrItr;
+               //if(ident == "KRHV") cout << tpr->plane.callsign << '\n';
                conflict = AddToTrafficList(tpr);
        }       
        // Then the circuit list
-       //cout << "C" << flush;
+       //if(ident == "KRHV") cout << "C" << flush;
        for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
                TowerPlaneRec* tpr = *twrItr;
+               //if(ident == "KRHV") cout << tpr->plane.callsign << '\n';
                conflict = AddToTrafficList(tpr);
        }
        // And finally the hold list
@@ -1691,8 +1867,10 @@ bool FGTower::doThresholdUseOrder() {
                AddToTrafficList(tpr, true);
        }
        
+       
        if(0) {
-       //if(ident == "KEMT") {
+       //if(ident == "KRHV") {
+               cout << "T\n";
                for(twrItr = trafficList.begin(); twrItr != trafficList.end(); twrItr++) {
                        TowerPlaneRec* tpr = *twrItr;
                        cout << tpr->plane.callsign << '\t' << tpr->eta << '\t';
@@ -1768,9 +1946,7 @@ void FGTower::RegisterAIPlane(PlaneRec plane, FGAIPlane* ai, tower_traffic_type
        CalcETA(t);
        
        if(op == CIRCUIT && lg != LEG_UNKNOWN) {
-               cout << "AAAAAAAAAAAAAAAaa" << endl;
                AddToCircuitList(t);
-               cout << "BBBBBBBBBBBBBBbbb" << endl;
        } else {
                // FLAG A WARNING
        }
@@ -1909,7 +2085,6 @@ void FGTower::ReportLongFinal(string ID) {
 //void FGTower::ReportOuterMarker(string ID);
 //void FGTower::ReportMiddleMarker(string ID);
 //void FGTower::ReportInnerMarker(string ID);
-//void FGTower::ReportGoingAround(string ID);
 
 void FGTower::ReportRunwayVacated(string ID) {
        //cout << "Report Runway Vacated Called at tower " << ident << " by plane " << ID << '\n';
@@ -2036,11 +2211,44 @@ void FGTower::ReportDownwind(string ID) {
                // the moment that would b&gg?r up the constraint position calculations.
                RemoveFromAppList(ID);
                t->leg = DOWNWIND;
-               t->pos = t->planePtr->GetPos();
+               if(t->isUser) {
+                       t->pos.setlon(user_lon_node->getDoubleValue());
+                       t->pos.setlat(user_lat_node->getDoubleValue());
+                       t->pos.setelev(user_elev_node->getDoubleValue());
+               } else {
+                       // ASSERT(t->planePtr != NULL);
+                       t->pos = t->planePtr->GetPos();
+               }
+               CalcETA(t);
+               AddToCircuitList(t);
+       } else {
+               SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportDownwind(...)");
+       }
+}
+
+void FGTower::ReportGoingAround(string ID) {
+       if(ID == "USER") {
+               ID = fgGetString("/sim/user/callsign");
+               RemoveAllUserDialogOptions();   // TODO - it would be much more efficient if ATCDialog simply had a clear() function!!!
+               current_atcdialog->add_entry(ident, "@AP Tower @CS Downwind @RW", "Report Downwind", TOWER, (int)USER_REPORT_DOWNWIND);
+       }
+       TowerPlaneRec* t = FindPlane(ID);
+       if(t) {
+               //t->goAroundReported = true;  // No need to set this until we start responding to it.
+               responseReqd = false;   // might change in the future but for now we'll not distract them during the go-around.
+               // If the plane is in the app list, remove it and put it in the circuit list instead.
+               RemoveFromAppList(ID);
+               t->leg = CLIMBOUT;
+               if(t->isUser) {
+                       t->pos.setlon(user_lon_node->getDoubleValue());
+                       t->pos.setlat(user_lat_node->getDoubleValue());
+                       t->pos.setelev(user_elev_node->getDoubleValue());
+               } else {
+                       // ASSERT(t->planePtr != NULL);
+                       t->pos = t->planePtr->GetPos();
+               }
                CalcETA(t);
-               //cout << "DDDDDDDDDDDDDDDDdddddddd" << endl;
                AddToCircuitList(t);
-               //cout << "EEEEEEEEEEEEEEEEEEEEeeeeee" << endl;
        } else {
                SG_LOG(SG_ATC, SG_WARN, "WARNING: Unable to find plane " << ID << " in FGTower::ReportDownwind(...)");
        }
@@ -2076,7 +2284,7 @@ string FGTower::GenText(const string& m, int c) {
                        int check = 0;  // If mes gets overflowed the while loop can go infinite
                        while ( strchr(&mes[0], crej) != NULL  ) {      // ie. loop until no more occurances of crej ('@') found
                                pos = strchr( &mes[0], crej );
-                               bcopy(pos, &tag[0], 3);
+                               memmove(&tag[0], pos, 3);
                                tag[3] = '\0';
                                int i;
                                len = 0;