diff options
| author | planetmaker <planetmaker@openttd.org> | 2011-05-18 12:19:58 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2011-05-18 12:19:58 +0000 |
| commit | 43c8cd1d5e7d0fa2b7e369eac0239a41ae6c0bb1 (patch) | |
| tree | 2c682c0fff6be31263f2d3670e6bf718d86b3f4a /src/saveload | |
| parent | bc6b348e7a67b758fd4de5268941226380e5be24 (diff) | |
| download | openttd-43c8cd1d5e7d0fa2b7e369eac0239a41ae6c0bb1.tar.xz | |
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 4 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 4acd05b70..e8564c7ca 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2565,9 +2565,9 @@ bool AfterLoadGame() if (!v->IsPrimaryVehicle()) continue; /* Older versions are less strict with indices being in range and fix them on the fly */ - if (v->cur_auto_order_index >= v->GetNumOrders()) v->cur_auto_order_index = 0; + if (v->cur_implicit_order_index >= v->GetNumOrders()) v->cur_implicit_order_index = 0; - v->cur_real_order_index = v->cur_auto_order_index; + v->cur_real_order_index = v->cur_implicit_order_index; v->UpdateRealOrderIndex(); } } diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 6432fd20e..9cce166be 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1141,7 +1141,7 @@ static const OldChunks vehicle_chunk[] = { OCL_VAR ( OC_UINT16, 1, &_old_order ), OCL_NULL ( 1 ), ///< num_orders, now calculated - OCL_SVAR( OC_UINT8, Vehicle, cur_auto_order_index ), + OCL_SVAR( OC_UINT8, Vehicle, cur_implicit_order_index ), OCL_SVAR( OC_TILE, Vehicle, dest_tile ), OCL_SVAR( OC_UINT16, Vehicle, load_unload_ticks ), OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Vehicle, date_of_last_service ), diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index f3af88172..8928df710 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -504,7 +504,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_VAR(Vehicle, tick_counter, SLE_UINT8), SLE_CONDVAR(Vehicle, running_ticks, SLE_UINT8, 88, SL_MAX_VERSION), - SLE_VAR(Vehicle, cur_auto_order_index, SLE_UINT8), + SLE_VAR(Vehicle, cur_implicit_order_index, SLE_UINT8), SLE_CONDVAR(Vehicle, cur_real_order_index, SLE_UINT8, 158, SL_MAX_VERSION), /* num_orders is now part of OrderList and is not saved but counted */ SLE_CONDNULL(1, 0, 104), |