miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Simplify test for bridges above bridge ramps. (#14421)

Browse Source
This commit is contained in:
Peter Nelson
2025-07-08 13:55:36 +01:00
committed by GitHub
parent 6d86c760c6
commit b21c8a3450
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tunnelbridge_cmd.cpp
View File

@@ -413,17 +413,13 @@ CommandCost CmdBuildBridge(DoCommandFlags flags, TileIndex tile_end, TileIndex t
if (terraform_cost_south.Failed() || (terraform_cost_south.GetCost() != 0 && !allow_on_slopes)) return CommandCost(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION); if (terraform_cost_south.Failed() || (terraform_cost_south.GetCost() != 0 && !allow_on_slopes)) return CommandCost(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION);
cost.AddCost(terraform_cost_south.GetCost()); cost.AddCost(terraform_cost_south.GetCost());
const TileIndex heads[] = {tile_start, tile_end}; /* Check for bridges above the bridge ramps. */
for (int i = 0; i < 2; i++) { for (TileIndex tile : {tile_start, tile_end}) {
if (IsBridgeAbove(heads[i])) { if (!IsBridgeAbove(tile)) continue;
TileIndex north_head = GetNorthernBridgeEnd(heads[i]);
if (direction == GetBridgeAxis(heads[i])) return CommandCost(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); if (direction == GetBridgeAxis(tile)) return CommandCost(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
if (z_start + 1 == GetBridgeHeight(north_head)) { if (z_start + 1 == GetBridgeHeight(GetNorthernBridgeEnd(tile))) return CommandCost(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
return CommandCost(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
}
}
} }
TileIndexDiff delta = TileOffsByAxis(direction); TileIndexDiff delta = TileOffsByAxis(direction);