Import town bridges over rails patch

Add setting (default off)

From: https://www.tt-forums.net/viewtopic.php?f=33t=76052
This commit is contained in:
Jonathan G Rennison
2017-07-31 18:40:44 +01:00
parent 4db69283c1
commit 9ed0541e77
5 changed files with 17 additions and 4 deletions

View File

@@ -1242,14 +1242,14 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
const int delta = TileOffsByDiagDir(bridge_dir);
if (slope == SLOPE_FLAT) {
/* Bridges starting on flat tiles are only allowed when crossing rivers. */
/* Bridges starting on flat tiles are only allowed when crossing rivers or rails. */
do {
if (bridge_length++ >= 4) {
/* Allow to cross rivers, not big lakes. */
/* Allow to cross rivers, not big lakes, nor large amounts of rails. */
return false;
}
bridge_tile += delta;
} while (IsValidTile(bridge_tile) && IsWaterTile(bridge_tile) && !IsSea(bridge_tile));
} while (IsValidTile(bridge_tile) && ((IsWaterTile(bridge_tile) && !IsSea(bridge_tile)) || (_settings_game.economy.town_bridge_over_rail && IsPlainRailTile(bridge_tile))));
} else {
do {
if (bridge_length++ >= 11) {
@@ -1257,7 +1257,7 @@ static bool GrowTownWithBridge(const Town *t, const TileIndex tile, const DiagDi
return false;
}
bridge_tile += delta;
} while (IsValidTile(bridge_tile) && IsWaterTile(bridge_tile));
} while (IsValidTile(bridge_tile) && (IsWaterTile(bridge_tile) || (_settings_game.economy.town_bridge_over_rail && IsPlainRailTile(bridge_tile))));
}
/* no water tiles in between? */