summaryrefslogtreecommitdiff
path: root/src/ship_cmd.cpp
diff options
context:
space:
mode:
authormaedhros <maedhros@openttd.org>2007-06-25 23:14:13 +0000
committermaedhros <maedhros@openttd.org>2007-06-25 23:14:13 +0000
commitfb284a9264b96b591c963f741242d4d912a2cc45 (patch)
tree9a1114f3fc036e3b3e9e07878478310db7aadfff /src/ship_cmd.cpp
parent217765fc0bdd036e1ded296fcbf77ab3c9f98f05 (diff)
downloadopenttd-fb284a9264b96b591c963f741242d4d912a2cc45.tar.xz
(svn r10335) -Fix (r10331): Increment the current order index *after* using it in UpdateVehicleTimetable.
Diffstat (limited to 'src/ship_cmd.cpp')
-rw-r--r--src/ship_cmd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 92caf6e5b..2a76c8d8c 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -258,8 +258,8 @@ static void ProcessShipOrder(Vehicle *v)
if (!(v->current_order.flags & OF_PART_OF_ORDERS)) return;
if (v->current_order.flags & OF_SERVICE_IF_NEEDED &&
!VehicleNeedsService(v)) {
- v->cur_order_index++;
UpdateVehicleTimetable(v, true);
+ v->cur_order_index++;
}
break;
@@ -696,9 +696,9 @@ static void ShipController(Vehicle *v)
DistanceManhattan(v->dest_tile, gp.new_tile) <= 3) {
/* We got within 3 tiles of our target buoy, so let's skip to our
* next order */
+ UpdateVehicleTimetable(v, true);
v->cur_order_index++;
v->current_order.type = OT_DUMMY;
- UpdateVehicleTimetable(v, true);
InvalidateVehicleOrder(v);
} else {
/* Non-buoy orders really need to reach the tile */