cpp/openttd-patchpack/source Changeset - r9977:81afc34788de

Changeset - r9977:81afc34788de

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 16 years ago 2008-08-23 00:32:01
frosch@openttd.org

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

1 file changed with 5 insertions and 3 deletions:

src/order_cmd.cpp

0 comments (0 inline, 0 general)

src/order_cmd.cpp

➞

Show inline comments

@@ @@ -1628,6 +1628,8 @@ bool UpdateOrderDest(Vehicle *v, const O @@
 			break;
 		case OT_CONDITIONAL: {
 			if (conditional_depth > v->num_orders) return false;
 			VehicleOrderID next_order = ProcessConditionalOrder(order, v);
 			if (next_order != INVALID_VEH_ORDER_ID) {
 				UpdateVehicleTimetable(v, false);
@@ @@ -1638,12 +1640,12 @@ bool UpdateOrderDest(Vehicle *v, const O @@
 				v->cur_order_index++;
+			}
 			if (conditional_depth > v->num_orders) return false;
 			/* Get the current order */
 			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:

0 comments (0 inline, 0 general)