Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2021-10-17 13:04:30 +03:00
66 changed files with 2048 additions and 539 deletions

View File

@@ -3147,14 +3147,14 @@ bool AfterLoadGame()
}
}
if (IsSavegameVersionBeforeOrAt(SLV_ENDING_YEAR)) {
/* Update station docking tiles. Was only needed for pre-SLV_MULTITLE_DOCKS
* savegames, but a bug in docking tiles touched all savegames between
* SLV_MULTITILE_DOCKS and SLV_ENDING_YEAR. */
if (IsSavegameVersionBefore(SLV_REPAIR_OBJECT_DOCKING_TILES)) {
/* Placing objects on docking tiles was not updating adjacent station's docking tiles. */
for (Station *st : Station::Iterate()) {
if (st->ship_station.tile != INVALID_TILE) UpdateStationDockingTiles(st);
}
}
if (IsSavegameVersionBeforeOrAt(SLV_ENDING_YEAR)) {
/* Reset roadtype/streetcartype info for non-road bridges. */
for (TileIndex t = 0; t < map_size; t++) {
if (IsTileType(t, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(t) != TRANSPORT_ROAD) {