diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-17 10:19:00 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-17 10:19:00 +0000 |
| commit | 6b2f9e8c9edd6a8e5528898db0bbdb884b0221a2 (patch) | |
| tree | 11aa3acb6ccf66deee909b5ff688cc1670886f06 /src/saveload | |
| parent | 871107f52952ee59c353feab933126ed206e60bf (diff) | |
| download | openttd-6b2f9e8c9edd6a8e5528898db0bbdb884b0221a2.tar.xz | |
(svn r16328) -Fix: desync when removing lots of stations
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/misc_sl.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 3 | ||||
| -rw-r--r-- | src/saveload/station_sl.cpp | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/saveload/misc_sl.cpp b/src/saveload/misc_sl.cpp index 499dec754..088c1b26e 100644 --- a/src/saveload/misc_sl.cpp +++ b/src/saveload/misc_sl.cpp @@ -65,7 +65,7 @@ static const SaveLoadGlobVarList _date_desc[] = { SLEG_CONDVAR(_cur_tileloop_tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), SLEG_CONDVAR(_cur_tileloop_tile, SLE_UINT32, 6, SL_MAX_VERSION), SLEG_VAR(_disaster_delay, SLE_UINT16), - SLEG_VAR(_station_tick_ctr, SLE_UINT16), + SLE_CONDNULL(2, 0, 119), SLEG_VAR(_random.state[0], SLE_UINT32), SLEG_VAR(_random.state[1], SLE_UINT32), SLEG_CONDVAR(_cur_town_ctr, SLE_FILE_U8 | SLE_VAR_U32, 0, 9), diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 0dce4a5ae..787adde34 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1707,8 +1707,7 @@ static const OldChunks main_chunk[] = { OCL_CNULL( OC_TTD, 144 ), ///< AI cargo-stuff, calculated in InitializeLandscapeVariables OCL_NULL( 2 ), ///< Company indexes of companies, no longer in use - - OCL_VAR ( OC_FILE_U8 | OC_VAR_U16, 1, &_station_tick_ctr ), + OCL_NULL( 1 ), ///< Station tick counter, no longer in use OCL_VAR ( OC_UINT8, 1, &_settings_game.locale.currency ), OCL_VAR ( OC_UINT8, 1, &_settings_game.locale.units ), diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index e166e93a0..715ded17a 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -195,9 +195,6 @@ static void Load_STNS() SaveLoad_STNS(st); } - - /* This is to ensure all pointers are within the limits of _stations_size */ - if (_station_tick_ctr > GetMaxStationIndex()) _station_tick_ctr = 0; } static void Save_ROADSTOP() |