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/newgrf_engine.cpp | |
| 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/newgrf_engine.cpp')
| -rw-r--r-- | src/newgrf_engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 76c5572f0..dc1dffcf4 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -690,7 +690,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by case 0x0A: return v->current_order.MapOldOrder(); case 0x0B: return v->current_order.GetDestination(); case 0x0C: return v->GetNumOrders(); - case 0x0D: return v->cur_order_index; + case 0x0D: return v->cur_real_order_index; case 0x10: case 0x11: { uint ticks; |