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

Merge 235c6e2c55 into f35fa6679b

pull/13861/merge
John Taylor 2025-04-04 10:54:13 +00:00 committed by GitHub
parent f35fa6679b 235c6e2c55
commit 94c8ea1a30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/rail_cmd.cpp
View File

@ -885,30 +885,51 @@ static CommandCost CmdRailTrackHelper(DoCommandFlags flags, TileIndex tile, Tile
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
bool had_success = false; bool had_success = false;
bool first_tile = true;
TileIndex wormhole_end = INVALID_TILE;
CommandCost last_error = CMD_ERROR; CommandCost last_error = CMD_ERROR;
for (;;) { for (;;) {
ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals); /* Check if hopping bridge/tunnel (#11528). */
if (wormhole_end == INVALID_TILE && IsDiagonalTrackdir(trackdir) && GetTileType(tile) == MP_TUNNELBRIDGE && GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL) {
if (ret.Failed()) { /* If the building direction is the same as the bridge/tunnel direction, skip building tracks until the bridge/tunnel ends. */
last_error = std::move(ret); if (GetTunnelBridgeDirection(tile) == TrackdirToExitdir(trackdir)) {
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) { wormhole_end = GetOtherTunnelBridgeEnd(tile);
if (fail_on_obstacle) return last_error; } else if (!first_tile && GetTunnelBridgeDirection(tile) == TrackdirToExitdir(ReverseTrackdir(trackdir))) {
if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag break; // Upon running into a bridge ramp from the underside, we should stop building tracks.
} }
}
/* Ownership errors are more important. */ if (wormhole_end == INVALID_TILE) {
if (last_error.GetErrorMessage() == STR_ERROR_OWNED_BY && remove) break; ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals);
} else {
had_success = true; if (ret.Failed()) {
total_cost.AddCost(ret.GetCost()); last_error = std::move(ret);
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
if (fail_on_obstacle) return last_error;
if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag
}
/* Ownership errors are more important. */
if (last_error.GetErrorMessage() == STR_ERROR_OWNED_BY && remove) break;
} else {
had_success = true;
total_cost.AddCost(ret.GetCost());
}
} }
if (tile == end_tile) break; if (tile == end_tile) break;
/* Reset skip flag for the next tile after tunnel/bridge ending. */
if (wormhole_end == tile) {
wormhole_end = INVALID_TILE;
}
tile += ToTileIndexDiff(_trackdelta[trackdir]); tile += ToTileIndexDiff(_trackdelta[trackdir]);
/* toggle railbit for the non-diagonal tracks */ /* toggle railbit for the non-diagonal tracks */
if (!IsDiagonalTrackdir(trackdir)) ToggleBit(trackdir, 0); if (!IsDiagonalTrackdir(trackdir)) ToggleBit(trackdir, 0);
first_tile = false;
} }
if (had_success) return total_cost; if (had_success) return total_cost;