diff options
| author | yexo <yexo@openttd.org> | 2009-05-26 21:59:49 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-05-26 21:59:49 +0000 |
| commit | 0d56cfabfa6b6553f02a701d3ec3d92cc7067b63 (patch) | |
| tree | cbedc97360c42339860d6b03483900a203cf2ec3 /src/saveload | |
| parent | aa62ec0a1f7cc2416e0397eeccc90156d27b8b44 (diff) | |
| download | openttd-0d56cfabfa6b6553f02a701d3ec3d92cc7067b63.tar.xz | |
(svn r16439) -Change: Make the default vehicle servicing settings company-based settings, so in a multiplayer game everyone can change them.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/afterload.cpp | 8 | ||||
| -rw-r--r-- | src/saveload/company_sl.cpp | 7 | ||||
| -rw-r--r-- | src/saveload/saveload.cpp | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index d55b821e3..a298108aa 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -1846,6 +1846,14 @@ bool AfterLoadGame() } } + if (CheckSavegameVersion(120)) { + extern VehicleDefaultSettings _old_vds; + Company *c; + FOR_ALL_COMPANIES(c) { + c->settings.vehicle = _old_vds; + } + } + AfterLoadLabelMaps(); GamelogPrintDebug(1); diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index 8c44fee0c..940b561be 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -140,6 +140,13 @@ static const SaveLoad _company_desc[] = { SLE_CONDVAR(Company, settings.engine_renew_money, SLE_UINT32, 16, SL_MAX_VERSION), SLE_CONDVAR(Company, settings.renew_keep_length, SLE_BOOL, 2, SL_MAX_VERSION), + /* Default vehicle settings */ + SLE_CONDVAR(Company, settings.vehicle.servint_ispercent, SLE_BOOL, 120, SL_MAX_VERSION), + SLE_CONDVAR(Company, settings.vehicle.servint_trains, SLE_UINT16, 120, SL_MAX_VERSION), + SLE_CONDVAR(Company, settings.vehicle.servint_roadveh, SLE_UINT16, 120, SL_MAX_VERSION), + SLE_CONDVAR(Company, settings.vehicle.servint_aircraft, SLE_UINT16, 120, SL_MAX_VERSION), + SLE_CONDVAR(Company, settings.vehicle.servint_ships, SLE_UINT16, 120, SL_MAX_VERSION), + /* Reserve extra space in savegame here. (currently 63 bytes) */ SLE_CONDNULL(63, 2, SL_MAX_VERSION), diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 3412ae218..bdc292fcc 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -40,7 +40,7 @@ #include "saveload_internal.h" -extern const uint16 SAVEGAME_VERSION = 119; +extern const uint16 SAVEGAME_VERSION = 120; SavegameType _savegame_type; ///< type of savegame we are loading |