Mercurial > hg > openttd
changeset 14793:c9ea26de660d draft
(svn r19382) -Fix (r19381): don't break savegame version 139
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Wed, 10 Mar 2010 18:59:40 +0000 |
| parents | 3bcebfd23ea8 |
| children | a1410dd4d9da |
| files | src/saveload/afterload.cpp src/saveload/saveload.cpp src/saveload/station_sl.cpp |
| diffstat | 3 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2076,14 +2076,6 @@ } if (CheckSavegameVersion(139)) { - Station *st; - FOR_ALL_STATIONS(st) { - if (st->airport.tile != INVALID_TILE) { - st->airport.w = st->GetAirportSpec()->size_x; - st->airport.h = st->GetAirportSpec()->size_y; - } - } - Train *t; FOR_ALL_TRAINS(t) { /* Copy old GOINGUP / GOINGDOWN flags. */ @@ -2097,6 +2089,16 @@ } } + if (CheckSavegameVersion(140)) { + Station *st; + FOR_ALL_STATIONS(st) { + if (st->airport.tile != INVALID_TILE) { + st->airport.w = st->GetAirportSpec()->size_x; + st->airport.h = st->GetAirportSpec()->size_y; + } + } + } + /* Road stops is 'only' updating some caches */ AfterLoadRoadStops(); AfterLoadLabelMaps();
--- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -46,7 +46,7 @@ #include "saveload_internal.h" -extern const uint16 SAVEGAME_VERSION = 139; +extern const uint16 SAVEGAME_VERSION = 140; SavegameType _savegame_type; ///< type of savegame we are loading
--- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -332,8 +332,8 @@ SLE_REF(Station, truck_stops, REF_ROADSTOPS), SLE_VAR(Station, dock_tile, SLE_UINT32), SLE_VAR(Station, airport.tile, SLE_UINT32), - SLE_CONDVAR(Station, airport.w, SLE_UINT8, 139, SL_MAX_VERSION), - SLE_CONDVAR(Station, airport.h, SLE_UINT8, 139, SL_MAX_VERSION), + SLE_CONDVAR(Station, airport.w, SLE_UINT8, 140, SL_MAX_VERSION), + SLE_CONDVAR(Station, airport.h, SLE_UINT8, 140, SL_MAX_VERSION), SLE_VAR(Station, airport_type, SLE_UINT8), SLE_VAR(Station, airport_flags, SLE_UINT64),