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

Fix go to nearest depot and halt orders, not halting.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-01-11 23:49:23 +00:00
parent 6e829c39e4
commit c600ffe6d5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_cmd.cpp
View File

@@ -454,7 +454,7 @@ const Order *OrderList::GetNextDecisionNode(const Order *next, uint hops, uint32
} }
if (next->IsType(OT_GOTO_DEPOT)) { if (next->IsType(OT_GOTO_DEPOT)) {
if (next->GetDepotActionType() == ODATFB_HALT) return NULL; if (next->GetDepotActionType() & ODATFB_HALT) return NULL;
if (next->IsRefit()) return next; if (next->IsRefit()) return next;
} }

2
src/vehicle.cpp
View File

@@ -1901,7 +1901,7 @@ void VehicleEnterDepot(Vehicle *v)
if (v->current_order.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) { if (v->current_order.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) {
v->DeleteUnreachedImplicitOrders(); v->DeleteUnreachedImplicitOrders();
UpdateVehicleTimetable(v, true); UpdateVehicleTimetable(v, true);
if (v->current_order.IsWaitTimetabled()) { if (v->current_order.IsWaitTimetabled() && !(v->current_order.GetDepotActionType() & ODATFB_HALT)) {
v->current_order.MakeWaiting(); v->current_order.MakeWaiting();
v->current_order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION); v->current_order.SetNonStopType(ONSF_NO_STOP_AT_ANY_STATION);
return; return;