fly/flightgear
1
0
Fork 0
Code Activity

GroundController: remove always false condition

Browse source
This commit is contained in:
Scott Giese 2021-12-26 20:16:41 -06:00
parent 3e096fed41
commit e38fb0c440
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/ATC/GroundController.cxx
View file

@ -608,7 +608,8 @@ bool FGGroundController::checkForCircularWaits(int id)
} else { } else {
return false; return false;
} }
if (i == activeTraffic.end() || (trafficSize == 0)) {
if (i == activeTraffic.end()) {
SG_LOG(SG_GENERAL, SG_ALERT, SG_LOG(SG_GENERAL, SG_ALERT,
"AI error: Trying to access non-existing aircraft in FGGroundNetwork::checkForCircularWaits at " << SG_ORIGIN); "AI error: Trying to access non-existing aircraft in FGGroundNetwork::checkForCircularWaits at " << SG_ORIGIN);
} }
@ -623,12 +624,10 @@ bool FGGroundController::checkForCircularWaits(int id)
return false; return false;
} }
while ((target > 0) && (target != id) && counter++ < trafficSize) { while ((target > 0) && (target != id) && counter++ < trafficSize) {
//printed = true; //printed = true;
TrafficVectorIterator i = activeTraffic.begin(); TrafficVectorIterator i = activeTraffic.begin();
if (trafficSize) { if (trafficSize) {
//while ((i->getId() != id) && i != activeTraffic.end())
while (i != activeTraffic.end()) { while (i != activeTraffic.end()) {
if (i->getId() == target) { if (i->getId() == target) {
break; break;
@ -638,41 +637,24 @@ bool FGGroundController::checkForCircularWaits(int id)
} else { } else {
return false; return false;
} }
if (i == activeTraffic.end() || (trafficSize == 0)) {
if (i == activeTraffic.end()) {
SG_LOG(SG_ATC, SG_DEBUG, "[Waiting for traffic at Runway: DONE] "); SG_LOG(SG_ATC, SG_DEBUG, "[Waiting for traffic at Runway: DONE] ");
// The target id is not found on the current network, which means it's at the tower // The target id is not found on the current network, which means it's at the tower
SG_LOG(SG_ATC, SG_ALERT, "AI error: Trying to access non-existing aircraft in FGGroundNetwork::checkForCircularWaits"); SG_LOG(SG_ATC, SG_ALERT, "AI error: Trying to access non-existing aircraft in FGGroundNetwork::checkForCircularWaits");
return false; return false;
} }
other = i; other = i;
target = other->getWaitsForId(); target = other->getWaitsForId();
// actually this trap isn't as impossible as it first seemed: // actually this trap isn't as impossible as it first seemed:
// the setWaitsForID(id) is set to current when the aircraft // the setWaitsForID(id) is set to current when the aircraft
// is waiting for the user controlled aircraft. // is waiting for the user controlled aircraft.
//if (current->getId() == other->getId()) {
// SG_LOG(SG_ATC, SG_DEBUG, "Caught the impossible trap");
// SG_LOG(SG_ATC, SG_DEBUG, "Current = " << current->getId());
// SG_LOG(SG_ATC, SG_DEBUG, "Other = " << other ->getId());
// for (TrafficVectorIterator at = activeTraffic.begin();
// at != activeTraffic.end();
// at++) {
// SG_LOG(SG_ATC, SG_BULK, "currently active aircraft : " << at->getCallSign() << " with Id " << at->getId() << " waits for " << at->getWaitsForId());
// }
// exit(1);
if (current->getId() == other->getId()) if (current->getId() == other->getId())
return false; return false;
//}
//SG_LOG(SG_ATC, SG_DEBUG, current->getCallSign() << " (" << current->getId() << ") " << " -> " << other->getCallSign()
// << " (" << other->getId() << "); ");
//current = other;
} }
//if (printed) //if (printed)
SG_LOG(SG_ATC, SG_DEBUG, "[done] "); SG_LOG(SG_ATC, SG_DEBUG, "[done] ");
if (id == target) { if (id == target) {