(svn r12629) -Codechange: Split VehicleNeedsService() into Vehicle::NeedsServicing() and Vehicle::NeedsAutomaticServicing().

-Fix (r11052): Disable servicing by service-interval if a vehicle has depot orders.
This commit is contained in:
frosch
2008-04-08 15:48:32 +00:00
parent 4267797cc8
commit b91781b715
8 changed files with 35 additions and 17 deletions

View File

@@ -1352,7 +1352,7 @@ bool ProcessOrders(Vehicle *v)
/* Let a depot order in the orderlist interrupt. */
if (!(v->current_order.GetDepotOrderType() & ODTFB_PART_OF_ORDERS)) return false;
if ((v->current_order.GetDepotOrderType() & ODTFB_SERVICE) && !VehicleNeedsService(v)) {
if ((v->current_order.GetDepotOrderType() & ODTFB_SERVICE) && !v->NeedsServicing()) {
UpdateVehicleTimetable(v, true);
v->cur_order_index++;
}