Mercurial > hg > openttd
changeset 11838:6bbaad5a6b54 draft
(svn r16228) -Fix/Change (r16187): If we are heading for a different depot, do also not do the refitting-part of the depot-order.
-Fix (r16198): && != &, GetDepotOrderType != GetDepotActionType and - uhm - ODATFB_NEAREST_DEPOT is not set for current_order either.
| author | frosch <frosch@openttd.org> |
|---|---|
| date | Mon, 04 May 2009 19:27:22 +0000 |
| parents | f32d9dd80187 |
| children | ae3214263ea0 |
| files | src/vehicle.cpp |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -1038,9 +1038,19 @@ if (v->current_order.IsType(OT_GOTO_DEPOT)) { InvalidateWindow(WC_VEHICLE_VIEW, v->index); + const Order *real_order = GetVehicleOrder(v, v->cur_order_index); Order t = v->current_order; v->current_order.MakeDummy(); + /* Test whether we are heading for this depot. If not, do nothing. + * Note: The target depot for nearest-/manual-depot-orders is only updated on junctions, but we want to accept every depot. */ + if ((t.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) && + real_order != NULL && !(real_order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) && + (v->type == VEH_AIRCRAFT ? t.GetDestination() != GetStationIndex(v->tile) : v->dest_tile != v->tile)) { + /* We are heading for another depot, keep driving. */ + return; + } + if (t.IsRefit()) { _current_company = v->owner; CommandCost cost = DoCommand(v->tile, v->index, t.GetRefitCargo() | t.GetRefitSubtype() << 8, DC_EXEC, GetCmdRefitVeh(v)); @@ -1057,9 +1067,7 @@ } } - if (t.GetDepotOrderType() & ODTFB_PART_OF_ORDERS && ( - (t.GetDepotOrderType() && ODATFB_NEAREST_DEPOT) || // The target depot is only updated on junctions, but we want to accept every depot. - (v->type == VEH_AIRCRAFT ? t.GetDestination() == GetStationIndex(v->tile) : v->dest_tile == v->tile))) { + if (t.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) { /* Part of orders */ UpdateVehicleTimetable(v, true); v->cur_order_index++;