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

(svn r20375) -Codechange: make sure the watertype for existing airport tiles is set to invalid

release/1.1
yexo 2010-08-05 12:06:53 +00:00
parent 2e6713ce95
commit f8b7163b34
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/afterload.cpp
View File

@ -2153,6 +2153,12 @@ bool AfterLoadGame()
FOR_ALL_DEPOTS(d) d->build_date = _date; FOR_ALL_DEPOTS(d) d->build_date = _date;
} }
if (CheckSavegameVersion(145)) {
for (TileIndex t = 0; t < map_size; t++) {
if (IsAirportTile(t)) SetWaterClass(t, WATER_CLASS_INVALID);
}
}
/* Road stops is 'only' updating some caches */ /* Road stops is 'only' updating some caches */
AfterLoadRoadStops(); AfterLoadRoadStops();
AfterLoadLabelMaps(); AfterLoadLabelMaps();

2
src/station_cmd.cpp
View File

@ -2225,7 +2225,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
it = as->table[layout]; it = as->table[layout];
do { do {
TileIndex cur_tile = tile + ToTileIndexDiff(it->ti); TileIndex cur_tile = tile + ToTileIndexDiff(it->ti);
MakeAirport(cur_tile, st->owner, st->index, it->gfx); MakeAirport(cur_tile, st->owner, st->index, it->gfx, WATER_CLASS_INVALID);
SetStationTileRandomBits(cur_tile, GB(Random(), 0, 4)); SetStationTileRandomBits(cur_tile, GB(Random(), 0, 4));
st->airport.Add(cur_tile); st->airport.Add(cur_tile);

4
src/station_map.h
View File

@ -640,10 +640,12 @@ static inline void MakeDriveThroughRoadStop(TileIndex t, Owner station, Owner ro
* @param o the owner of the airport * @param o the owner of the airport
* @param sid the station to which this tile belongs * @param sid the station to which this tile belongs
* @param section the StationGfx to be used for this tile * @param section the StationGfx to be used for this tile
* @param wc the type of water on this tile
*/ */
static inline void MakeAirport(TileIndex t, Owner o, StationID sid, byte section) static inline void MakeAirport(TileIndex t, Owner o, StationID sid, byte section, WaterClass wc)
{ {
MakeStation(t, o, sid, STATION_AIRPORT, section); MakeStation(t, o, sid, STATION_AIRPORT, section);
SetWaterClass(t, wc);
} }
/** /**