From fb284a9264b96b591c963f741242d4d912a2cc45 Mon Sep 17 00:00:00 2001 From: maedhros Date: Mon, 25 Jun 2007 23:14:13 +0000 Subject: (svn r10335) -Fix (r10331): Increment the current order index *after* using it in UpdateVehicleTimetable. --- src/train_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/train_cmd.cpp') diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 00a49fa6b..92a30bcbf 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2380,8 +2380,8 @@ static bool ProcessTrainOrder(Vehicle *v) if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return false; if ((v->current_order.flags & OF_SERVICE_IF_NEEDED) && !VehicleNeedsService(v)) { - v->cur_order_index++; UpdateVehicleTimetable(v, true); + v->cur_order_index++; } break; @@ -2395,9 +2395,9 @@ static bool ProcessTrainOrder(Vehicle *v) /* check if we've reached the waypoint? */ bool at_waypoint = false; if (v->current_order.type == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) { + UpdateVehicleTimetable(v, true); v->cur_order_index++; at_waypoint = true; - UpdateVehicleTimetable(v, true); } /* check if we've reached a non-stop station while TTDPatch nonstop is enabled.. */ @@ -2405,8 +2405,8 @@ static bool ProcessTrainOrder(Vehicle *v) v->current_order.flags & OF_NON_STOP && IsTileType(v->tile, MP_STATION) && v->current_order.dest == GetStationIndex(v->tile)) { - v->cur_order_index++; UpdateVehicleTimetable(v, true); + v->cur_order_index++; } /* Get the current order */ -- cgit v1.2.3-54-g00ecf