(svn r25329) -Fix [FS#5582]: for refreshing next hops implicit orders are equivalent to explicit stopping orders

This commit is contained in:
fonsinchen 2013-06-07 22:12:39 +00:00
parent 4ed1de4683
commit a1a96b2e8b
1 changed files with 2 additions and 2 deletions

View File

@ -2125,7 +2125,7 @@ void Vehicle::RefreshNextHopsStats()
/* Make sure the first order is a station order. */
first = this->orders.list->GetNextStoppingOrder(this, first, hops++);
if (first == NULL) return;
} while (!first->IsType(OT_GOTO_STATION));
} while (!first->IsType(OT_GOTO_STATION) && !first->IsType(OT_IMPLICIT));
hops = 0;
const Order *cur = first;
@ -2181,7 +2181,7 @@ void Vehicle::RefreshNextHopsStats()
}
}
if (next->IsType(OT_GOTO_STATION)) {
if (next->IsType(OT_GOTO_STATION) || next->IsType(OT_IMPLICIT)) {
StationID next_station = next->GetDestination();
Station *st = Station::GetIfValid(cur->GetDestination());
if (st != NULL && next_station != INVALID_STATION && next_station != st->index) {