mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14134) -Fix (r12667, r13579) [FS#2245]: Update 'current_order' when changing 'cur_order_index'.

release/0.7
frosch 2008-08-23 00:32:01 +00:00
parent ca27155a52
commit f625ecbeba
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/order_cmd.cpp
View File

@ -1628,6 +1628,8 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth)
break; break;
case OT_CONDITIONAL: { case OT_CONDITIONAL: {
if (conditional_depth > v->num_orders) return false;
VehicleOrderID next_order = ProcessConditionalOrder(order, v); VehicleOrderID next_order = ProcessConditionalOrder(order, v);
if (next_order != INVALID_VEH_ORDER_ID) { if (next_order != INVALID_VEH_ORDER_ID) {
UpdateVehicleTimetable(v, false); UpdateVehicleTimetable(v, false);
@ -1638,12 +1640,12 @@ bool UpdateOrderDest(Vehicle *v, const Order *order, int conditional_depth)
v->cur_order_index++; v->cur_order_index++;
} }
if (conditional_depth > v->num_orders) return false;
/* Get the current order */ /* Get the current order */
if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0; if (v->cur_order_index >= v->num_orders) v->cur_order_index = 0;
return UpdateOrderDest(v, GetVehicleOrder(v, v->cur_order_index), conditional_depth + 1); const Order *order = GetVehicleOrder(v, v->cur_order_index);
v->current_order = *order;
return UpdateOrderDest(v, order, conditional_depth + 1);
} }
default: default: