diff options
| author | frosch <frosch@openttd.org> | 2011-01-31 20:44:15 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-01-31 20:44:15 +0000 |
| commit | a97d52a29a990132a8a5e4dd60304483617cec50 (patch) | |
| tree | 0d8d42d633feabb438f812cedf0534a3c665074e /src/ai | |
| parent | 67a5cd0b185158ca4926c8cb45f1735a1001e00b (diff) | |
| download | openttd-a97d52a29a990132a8a5e4dd60304483617cec50.tar.xz | |
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/api/ai_order.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp index fbf284563..3bde539be 100644 --- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -132,7 +132,7 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or if (!AIVehicle::IsValidVehicle(vehicle_id)) return ORDER_INVALID; if (order_position == ORDER_CURRENT) { - int cur_order_pos = ::Vehicle::Get(vehicle_id)->cur_order_index; + int cur_order_pos = ::Vehicle::Get(vehicle_id)->cur_real_order_index; const Order *order = ::Vehicle::Get(vehicle_id)->GetOrder(0); if (order == NULL) return ORDER_INVALID; int num_automatic_orders = 0; |