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

Departure boards: Fix crash with vehicles which only have implicit orders

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-11-26 18:38:26 +00:00
parent 5a419e4bdd
commit cd6ab2c385
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/departures.cpp
View File

@@ -279,8 +279,11 @@ DepartureList* MakeDepartureList(StationID station, const std::vector<const Vehi
/* vehicle is taking a conditional order branch, adjust start time to compensate */ /* vehicle is taking a conditional order branch, adjust start time to compensate */
const Order *real_current_order = v->GetOrder(v->cur_real_order_index); const Order *real_current_order = v->GetOrder(v->cur_real_order_index);
const Order *real_timetable_order = v->GetOrder(v->cur_timetable_order_index); const Order *real_timetable_order = v->GetOrder(v->cur_timetable_order_index);
assert(real_timetable_order->IsType(OT_CONDITIONAL)); if (real_timetable_order->IsType(OT_CONDITIONAL)) {
start_date += (real_timetable_order->GetWaitTime() - real_current_order->GetTravelTime()); start_date += (real_timetable_order->GetWaitTime() - real_current_order->GetTravelTime());
} else {
/* This can also occur with implicit orders, when there are no real orders, do nothing */
}
} }
DepartureStatus status = D_TRAVELLING; DepartureStatus status = D_TRAVELLING;
bool should_reset_lateness = false; bool should_reset_lateness = false;