Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2024-04-11 13:24:33 +07:00
43 changed files with 805 additions and 625 deletions

View File

@@ -416,8 +416,8 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
SetDParam(6, CargoSpec::Get(order->GetRefitCargo())->name);
}
/* Do not show unbunching in the depot in the timetable window. */
if (!timetable && (order->GetDepotActionType() & ODATFB_UNBUNCH)) {
/* Show unbunching depot in both order and timetable windows. */
if (order->GetDepotActionType() & ODATFB_UNBUNCH) {
SetDParam(8, STR_ORDER_WAIT_TO_UNBUNCH);
}