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

Merge b8d966029c into a46a3a97f3

Kuhnovic 2025-06-24 07:02:03 +00:00 committed by GitHub
parent a46a3a97f3 b8d966029c
commit 4c637c283c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/rail_cmd.cpp
View File

@ -884,11 +884,33 @@ static CommandCost CmdRailTrackHelper(DoCommandFlags flags, TileIndex tile, Tile
CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile); CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
int distance_remaining = static_cast<int>(DistanceManhattan(tile, end_tile)) + 1;
auto advance = [&] {
distance_remaining--;
tile = TileAddByDiagDir(tile, TrackdirToExitdir(trackdir));
trackdir = NextTrackdir(trackdir);
};
bool had_success = false; bool had_success = false;
CommandCost last_error = CMD_ERROR; CommandCost last_error = CMD_ERROR;
for (;;) { for (; distance_remaining > 0; advance()) {
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); if (!remove && !fail_on_obstacle && CheckTileOwnership(tile).Succeeded() && IsCompatibleRail(GetRailType(tile), railtype)) {
if (!remove && !fail_on_obstacle && last_error.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) had_success = true; /* Skip stations and waypoints */
if (HasStationTileRail(tile) && GetRailStationTrack(tile) == track) continue;
/* Skip bridges and tunnels */
if (IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL
&& DiagDirToDiagTrackdir(GetTunnelBridgeDirection(tile)) == trackdir ) {
const uint length = GetTunnelBridgeLength(tile, GetOtherTunnelBridgeEnd(tile));
for (uint i = 0; i <= length; ++i) advance();
continue;
}
}
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);
if (!remove && !fail_on_obstacle && ret.GetErrorMessage() == STR_ERROR_ALREADY_BUILT) had_success = true;
if (ret.Failed()) { if (ret.Failed()) {
last_error = std::move(ret); last_error = std::move(ret);
@ -903,13 +925,6 @@ static CommandCost CmdRailTrackHelper(DoCommandFlags flags, TileIndex tile, Tile
had_success = true; had_success = true;
total_cost.AddCost(ret.GetCost()); total_cost.AddCost(ret.GetCost());
} }
if (tile == end_tile) break;
tile += ToTileIndexDiff(_trackdelta[trackdir]);
/* toggle railbit for the non-diagonal tracks */
if (!IsDiagonalTrackdir(trackdir)) ToggleBit(trackdir, 0);
} }
if (had_success) return total_cost; if (had_success) return total_cost;