dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'departure-boards-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-09 17:11:17 +01:00
parent 365f1c237f d5f9709c56
commit bd10b0fb0b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/departures.cpp
View File

@@ -205,8 +205,8 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
continue;
}
/* If an order doesn't have a travel time set, then stop. */
if (order->GetTravelTime() == 0) {
/* If an order has a 0 travel time, and it's not explictly set, then stop. */
if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) {
break;
}
@@ -362,7 +362,7 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
candidate_via = (StationID)order->GetDestination();
}
if (c.scheduled_date != 0 && order->GetTravelTime() != 0) {
if (c.scheduled_date != 0 && (order->GetTravelTime() != 0 || order->IsTravelTimetabled())) {
c.scheduled_date += order->GetTravelTime();
} else {
c.scheduled_date = 0;
@@ -585,8 +585,8 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
continue;
}
/* If an order doesn't have a travel time set, then stop. */
if (order->GetTravelTime() == 0) {
/* If an order has a 0 travel time, and it's not explictly set, then stop. */
if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) {
break;
}