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

(svn r19380) -Fix [FS#3678] (r19322): updating the id of the oilrig airport should be done earlier as it can be used by newgrf code

release/1.1
yexo 2010-03-10 18:46:26 +00:00
parent 5a9ffbb1b8
commit 0cf90dbeb0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/saveload/afterload.cpp
View File

@ -586,6 +586,18 @@ bool AfterLoadGame()
* filled; and that could eventually lead to desyncs. */ * filled; and that could eventually lead to desyncs. */
CargoPacket::AfterLoad(); CargoPacket::AfterLoad();
/* Oilrig was moved from id 15 to 9. We have to do this conversion
* here as AfterLoadVehicles can check it indirectly via the newgrf
* code. */
if (CheckSavegameVersion(139)) {
Station *st;
FOR_ALL_STATIONS(st) {
if (st->airport.tile != INVALID_TILE && st->airport_type == 15) {
st->airport_type = AT_OILRIG;
}
}
}
/* Update all vehicles */ /* Update all vehicles */
AfterLoadVehicles(true); AfterLoadVehicles(true);
@ -2067,7 +2079,6 @@ bool AfterLoadGame()
Station *st; Station *st;
FOR_ALL_STATIONS(st) { FOR_ALL_STATIONS(st) {
if (st->airport.tile != INVALID_TILE) { if (st->airport.tile != INVALID_TILE) {
if (st->airport_type == 15) st->airport_type = AT_OILRIG;
st->airport.w = st->GetAirportSpec()->size_x; st->airport.w = st->GetAirportSpec()->size_x;
st->airport.h = st->GetAirportSpec()->size_y; st->airport.h = st->GetAirportSpec()->size_y;
} }