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

(svn r16457) -Fix [FS#2925]: skipping a 'nearest depot order' because none could be found could cause multiple orders to get skipped

Browse Source
This commit is contained in:
rubidium
2009-05-28 21:12:54 +00:00
parent d7b0aa47c5
commit 62a2dff61e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/order_cmd.cpp
View File

@@ -1628,8 +1628,15 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth)
} }
} }
} else { } else {
if (conditional_depth > v->GetNumOrders()) return false;
UpdateVehicleTimetable(v, true); UpdateVehicleTimetable(v, true);
v->IncrementOrderIndex(); v->IncrementOrderIndex();
/* Get the current order */
const Order *order = v->GetOrder(v->cur_order_index);
v->current_order = *order;
return UpdateOrderDest(v, order, conditional_depth + 1);
} }
} else if (v->type != VEH_AIRCRAFT) { } else if (v->type != VEH_AIRCRAFT) {
v->dest_tile = Depot::Get(order->GetDestination())->xy; v->dest_tile = Depot::Get(order->GetDestination())->xy;