Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give bridges over the sea a more generous length limit

Browse Source
This commit is contained in:
Jonathan G Rennison 2021-06-17 00:52:53 +01:00
parent bfdabf4cb2
commit 0f336bba57
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/road.cpp
View File

@ -425,13 +425,18 @@ static TileIndex BuildBridge(PathNode *current, TileIndex end_tile = INVALID_TIL
if (!build_bridge) { if (!build_bridge) {
const DiagDirection direction = ReverseDiagDir(GetInclinedSlopeDirection(GetTileSlope(start_tile))); const DiagDirection direction = ReverseDiagDir(GetInclinedSlopeDirection(GetTileSlope(start_tile)));
TileIndex tile = start_tile + TileOffsByDiagDir(direction);
const bool is_over_water = IsValidTile(tile) && IsTileType(tile, MP_WATER) && IsSea(tile);
uint bridge_length = 0;
const uint bridge_length_limit = std::min<uint>(_settings_game.construction.max_bridge_length, is_over_water ? 20 : 10);
// We are not building yet, so we still need to find the end_tile. // We are not building yet, so we still need to find the end_tile.
for (TileIndex tile = start_tile + TileOffsByDiagDir(direction); for (;
IsValidTile(tile) && IsValidTile(tile) &&
(GetTunnelBridgeLength(start_tile, tile) <= std::min(_settings_game.construction.max_bridge_length, (uint16)10)) && (bridge_length <= bridge_length_limit) &&
(GetTileZ(start_tile) < (GetTileZ(tile) + _settings_game.construction.max_bridge_height)) && (GetTileZ(start_tile) < (GetTileZ(tile) + _settings_game.construction.max_bridge_height)) &&
(GetTileZ(tile) <= GetTileZ(start_tile)); (GetTileZ(tile) <= GetTileZ(start_tile));
tile += TileOffsByDiagDir(direction)) { tile += TileOffsByDiagDir(direction), bridge_length++) {
auto is_complementary_slope = auto is_complementary_slope =
!IsSteepSlope(GetTileSlope(tile)) && !IsSteepSlope(GetTileSlope(tile)) &&