// TODO - attempt to get a departure control pointer to see if we need to hand off departing traffic to departure.
// Get the airport elevation
- aptElev = dclGetAirportElev(ident.c_str());
+ aptElev = fgGetAirportElev(ident.c_str());
// TODO - this function only assumes one active rwy.
DoRwyDetails();
t->planePtr = NULL;
t->clearedToTakeOff = true;
rwyList.push_back(t);
+ rwyListItr = rwyList.begin();
departed = false;
} else {
//cout << "User not on active runway\n";
// 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);
+ current_atcdialog->add_entry(ident, "@AP Tower @CS @MI miles @CD of the airport for full stop with ATIS", "Contact tower for VFR arrival (full stop)", TOWER, (int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP);
}
}
}
ClearHoldingPlane(t);
t->leg = TAKEOFF_ROLL;
rwyList.push_back(t);
+ rwyListItr = rwyList.begin();
rwyOccupied = true;
// WARNING - WE ARE ASSUMING ONLY ONE PLANE REPORTING HOLD AT A TIME BELOW
// FIXME TODO - FIX THIS!!!
- if(holdList.size()) {
+ if(!holdList.empty()) {
if(holdListItr == holdList.end()) {
holdListItr = holdList.begin();
}
// 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.
+ if((i == 1) && rwyList.empty() && (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);
if(!t->isUser) t->planePtr->RegisterTransmission(5);
} else {
// Cop-out!!
- trns += " cleared for taxi to the GA parking";
+ trns += " cleared for taxi to general aviation parking";
if(!t->isUser) t->planePtr->RegisterTransmission(6); // TODO - this is a mega-hack!!
}
//cout << "trns = " << trns << '\n';
// Do one plane from the hold list
void FGTower::CheckHoldList(double dt) {
//cout << "Entering CheckHoldList..." << endl;
- if(holdList.size()) {
+ if(!holdList.empty()) {
//cout << "*holdListItr = " << *holdListItr << endl;
if(holdListItr == holdList.end()) {
holdListItr = holdList.begin();
ClearHoldingPlane(t);
t->leg = TAKEOFF_ROLL;
rwyList.push_back(t);
+ rwyListItr = rwyList.begin();
rwyOccupied = true;
holdList.erase(holdListItr);
holdListItr = holdList.begin();
+ if (holdList.empty())
+ return;
}
}
// TODO - rationalise the considerable code duplication above!
downwind_leg_pos = 0.0;
crosswind_leg_pos = 0.0;
- if(circuitList.size()) { // Do one plane from the circuit
+ if(!circuitList.empty()) { // Do one plane from the circuit
if(circuitListItr == circuitList.end()) {
circuitListItr = circuitList.begin();
}
t->opType = OUTBOUND; // TODO - could check if the user has climbed significantly above circuit altitude as well.
// Since we are unknown operation we should be in depList already.
//cout << ident << " Removing user from circuitList (TTT_UNKNOWN)\n";
- circuitList.erase(circuitListItr);
+ circuitListItr = circuitList.erase(circuitListItr);
RemoveFromTrafficList(t->plane.callsign);
- circuitListItr = circuitList.begin();
+ if (circuitList.empty())
+ return;
}
} else if(t->opType == CIRCUIT) {
if(tortho.y() > 10000) {
// 10 km out - assume the user has abandoned the circuit!!
t->opType = OUTBOUND;
depList.push_back(t);
+ depListItr = depList.begin();
//cout << ident << " removing user from circuitList (CIRCUIT)\n";
- circuitList.erase(circuitListItr);
- circuitListItr = circuitList.begin();
+ circuitListItr = circuitList.erase(circuitListItr);
+ if (circuitList.empty())
+ return;
}
}
}
circuitListItr = circuitList.erase(circuitListItr);
if(circuitListItr == circuitList.end() ) {
circuitListItr = circuitList.begin();
+ // avoid increment of circuitListItr (would increment to second element, or crash if no element left)
+ return;
}
}
++circuitListItr;
// It's possible we could be a bit more proactive about this.
} else if(t->opType == OUTBOUND) {
depList.push_back(t);
+ depListItr = depList.begin();
rwyList.pop_front();
departed = true;
timeSinceLastDeparture = 0.0;
} else if(t->opType == CIRCUIT) {
//cout << ident << " adding " << t->plane.callsign << " to circuitList" << endl;
circuitList.push_back(t);
+ circuitListItr = circuitList.begin();
AddToTrafficList(t);
rwyList.pop_front();
departed = true;
timeSinceLastDeparture = 0.0;
} else if(t->opType == TTT_UNKNOWN) {
depList.push_back(t);
+ depListItr = depList.begin();
//cout << ident << " adding " << t->plane.callsign << " to circuitList" << endl;
circuitList.push_back(t);
+ circuitListItr = circuitList.begin();
AddToTrafficList(t);
rwyList.pop_front();
departed = true;
void FGTower::CheckApproachList(double dt) {
//cout << "CheckApproachList called for " << ident << endl;
//cout << "AppList.size is " << appList.size() << endl;
- if(appList.size()) {
+ if(!appList.empty()) {
if(appListItr == appList.end()) {
appListItr = appList.begin();
}
if(appListItr == appList.end() ) {
appListItr = appList.begin();
}
+ if (appList.empty())
+ return;
+
}
++appListItr;
// Do one plane from the departure list
void FGTower::CheckDepartureList(double dt) {
- if(depList.size()) {
+ if(!depList.empty()) {
if(depListItr == depList.end()) {
depListItr = depList.begin();
}
// 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);
+ current_atcdialog->add_entry(ident, "@AP Tower @CS @MI miles @CD of the airport for full stop with ATIS", "Contact tower for VFR arrival (full stop)", TOWER, (int)USER_REQUEST_VFR_ARRIVAL_FULL_STOP);
} else {
// Send a clear-of-airspace signal
// TODO - implement this once we actually have departing AI traffic (currently all circuits or arrivals).
// It depends on what the two planes are doing and whether there's a conflict what we do.
if(tpr->eta - t->eta > separation_time) { // No probs, plane 2 can squeeze in before plane 1 with no apparent conflict
circuitList.insert(twrItr, t);
+ circuitListItr = circuitList.begin();
} else { // Ooops - this ones tricky - we have a potential conflict!
conflict = true;
// HACK - just add anyway for now and flag conflict.
circuitList.insert(twrItr, t);
+ circuitListItr = circuitList.begin();
}
//cout << "\tC\t" << circuitList.size() << '\n';
return(conflict);
// If we get here we must be at the end of the list, or maybe the list is empty.
//cout << ident << " adding " << t->plane.callsign << " to circuitList" << endl;
circuitList.push_back(t); // TODO - check the separation with the preceding plane for the conflict flag.
+ circuitListItr = circuitList.begin();
//cout << "\tE\t" << circuitList.size() << endl;
return(conflict);
}
responseReqd = true;
appList.push_back(t); // Not necessarily permanent
+ appListItr = appList.begin();
AddToTrafficList(t);
current_atcdialog->remove_entry(ident, USER_REQUEST_VFR_ARRIVAL, TOWER);
//cout << "Before adding, appList.size = " << appList.size() << " at " << ident << '\n';
appList.push_back(t); // Not necessarily permanent
+ appListItr = appList.begin();
//cout << "After adding, appList.size = " << appList.size() << " at " << ident << '\n';
AddToTrafficList(t);
}
t = *twrItr;
twrItr = appList.erase(twrItr);
appListItr = appList.begin();
+ break;
}
}
for(twrItr = depList.begin(); twrItr != depList.end(); twrItr++) {
if((*twrItr)->plane.callsign == ID) {
t = *twrItr;
twrItr = depList.erase(twrItr);
- twrItr--;
depListItr = depList.begin();
+ break;
}
}
for(twrItr = circuitList.begin(); twrItr != circuitList.end(); twrItr++) {
t = *twrItr;
twrItr = circuitList.erase(twrItr);
circuitListItr = circuitList.begin();
+ break;
}
}
for(twrItr = holdList.begin(); twrItr != holdList.end(); twrItr++) {
t = *twrItr;
twrItr = holdList.erase(twrItr);
holdListItr = holdList.begin();
+ break;
}
}
for(twrItr = rwyList.begin(); twrItr != rwyList.end(); twrItr++) {
t = *twrItr;
twrItr = rwyList.erase(twrItr);
rwyListItr = rwyList.begin();
+ break;
}
}
for(twrItr = vacatedList.begin(); twrItr != vacatedList.end(); twrItr++) {
t = *twrItr;
twrItr = vacatedList.erase(twrItr);
vacatedListItr = vacatedList.begin();
+ break;
}
}
for(twrItr = trafficList.begin(); twrItr != trafficList.end(); twrItr++) {
t = *twrItr;
twrItr = trafficList.erase(twrItr);
trafficListItr = trafficList.begin();
+ break;
}
}
- // And finally, delete the record if we found it.
- if(t) delete t;
+ // And finally, delete the record.
+ delete t;
}
void FGTower::ReportDownwind(const string& ID) {
projects / flightgear.git / blobdiff