mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19382) -Fix (r19381): don't break savegame version 139

release/1.1
yexo 2010-03-10 18:59:40 +00:00
parent 1a28aaf69e
commit 22081cbd19
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/saveload/afterload.cpp
View File

@ -2076,14 +2076,6 @@ bool AfterLoadGame()
}
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 @@ bool AfterLoadGame()
}
}
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();

2
src/saveload/saveload.cpp
View File

@ -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

4
src/saveload/station_sl.cpp
View File

@ -332,8 +332,8 @@ static const SaveLoad _station_desc[] = {
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),