diff options
| author | frosch <frosch@openttd.org> | 2012-07-29 16:48:00 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-07-29 16:48:00 +0000 |
| commit | 9527bad3a7fe4098ff2ebe2173e2d7b14d1aaaa7 (patch) | |
| tree | da0bb313402db4fcc98c06b17dcca2f945f0af62 /src/saveload | |
| parent | fcbe53d204ae2f66054c2f93ada1eda46e2ef6b9 (diff) | |
| download | openttd-9527bad3a7fe4098ff2ebe2173e2d7b14d1aaaa7.tar.xz | |
(svn r24446) -Add [FS#5199]: Store more consist properties in order backups.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/order_sl.cpp | 23 | ||||
| -rw-r--r-- | src/saveload/saveload.cpp | 3 |
2 files changed, 16 insertions, 10 deletions
diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index 4637d4a80..c72d982ad 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -244,15 +244,20 @@ static void Ptrs_ORDL() const SaveLoad *GetOrderBackupDescription() { static const SaveLoad _order_backup_desc[] = { - SLE_VAR(OrderBackup, user, SLE_UINT32), - SLE_VAR(OrderBackup, tile, SLE_UINT32), - SLE_VAR(OrderBackup, group, SLE_UINT16), - SLE_VAR(OrderBackup, service_interval, SLE_INT32), - SLE_STR(OrderBackup, name, SLE_STR, 0), - SLE_VAR(OrderBackup, clone, SLE_UINT16), - SLE_VAR(OrderBackup, cur_real_order_index, SLE_UINT8), - SLE_REF(OrderBackup, orders, REF_ORDER), - SLE_END() + SLE_VAR(OrderBackup, user, SLE_UINT32), + SLE_VAR(OrderBackup, tile, SLE_UINT32), + SLE_VAR(OrderBackup, group, SLE_UINT16), + SLE_VAR(OrderBackup, service_interval, SLE_INT32), + SLE_STR(OrderBackup, name, SLE_STR, 0), + SLE_VAR(OrderBackup, clone, SLE_UINT16), + SLE_VAR(OrderBackup, cur_real_order_index, SLE_UINT8), + SLE_CONDVAR(OrderBackup, cur_implicit_order_index, SLE_UINT8, 176, SL_MAX_VERSION), + SLE_CONDVAR(OrderBackup, current_order_time, SLE_UINT32, 176, SL_MAX_VERSION), + SLE_CONDVAR(OrderBackup, lateness_counter, SLE_INT32, 176, SL_MAX_VERSION), + SLE_CONDVAR(OrderBackup, timetable_start, SLE_INT32, 176, SL_MAX_VERSION), + SLE_CONDVAR(OrderBackup, vehicle_flags, SLE_UINT8, 176, SL_MAX_VERSION), + SLE_REF(OrderBackup, orders, REF_ORDER), + SLE_END() }; return _order_backup_desc; diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 7cc1da4ed..d49d90a5a 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -239,8 +239,9 @@ * 173 23967 1.2.0-RC1 * 174 23973 1.2.x * 175 24136 + * 176 24446 */ -extern const uint16 SAVEGAME_VERSION = 175; ///< Current savegame version of OpenTTD. +extern const uint16 SAVEGAME_VERSION = 176; ///< Current savegame version of OpenTTD. SavegameType _savegame_type; ///< type of savegame we are loading |