mirror of https://github.com/OpenTTD/OpenTTD.git
Revert #11606: Don't auto-build past tunnelbridge ends
This reverts commit 59f6c199bf
.
This commit is contained in:
parent
ebd258b404
commit
e0e0d5f8fb
|
@ -886,32 +886,22 @@ static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, TileI
|
||||||
if (ret.Failed()) return ret;
|
if (ret.Failed()) return ret;
|
||||||
|
|
||||||
bool had_success = false;
|
bool had_success = false;
|
||||||
bool under_tunnelbridge = false;
|
|
||||||
CommandCost last_error = CMD_ERROR;
|
CommandCost last_error = CMD_ERROR;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
/* Don't try to place rail between tunnelbridge ends */
|
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 (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
|
||||||
under_tunnelbridge = !under_tunnelbridge;
|
if (ret.Failed()) {
|
||||||
} else if (!under_tunnelbridge) {
|
last_error = ret;
|
||||||
if (remove) {
|
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
|
||||||
ret = Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir));
|
if (fail_on_obstacle) return last_error;
|
||||||
} else {
|
if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag
|
||||||
ret = Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret.Failed()) {
|
/* Ownership errors are more important. */
|
||||||
last_error = ret;
|
if (last_error.GetErrorMessage() == STR_ERROR_OWNED_BY && remove) break;
|
||||||
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
|
} else {
|
||||||
if (fail_on_obstacle) return last_error;
|
had_success = true;
|
||||||
if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag
|
total_cost.AddCost(ret);
|
||||||
}
|
|
||||||
|
|
||||||
/* Ownership errors are more important. */
|
|
||||||
if (last_error.GetErrorMessage() == STR_ERROR_OWNED_BY && remove) break;
|
|
||||||
} else {
|
|
||||||
had_success = true;
|
|
||||||
total_cost.AddCost(ret);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tile == end_tile) break;
|
if (tile == end_tile) break;
|
||||||
|
|
|
@ -1007,55 +1007,49 @@ CommandCost CmdBuildLongRoad(DoCommandFlag flags, TileIndex end_tile, TileIndex
|
||||||
bool had_bridge = false;
|
bool had_bridge = false;
|
||||||
bool had_tunnel = false;
|
bool had_tunnel = false;
|
||||||
bool had_success = false;
|
bool had_success = false;
|
||||||
bool under_tunnelbridge = false;
|
|
||||||
|
|
||||||
/* Start tile is the first tile clicked by the user. */
|
/* Start tile is the first tile clicked by the user. */
|
||||||
for (;;) {
|
for (;;) {
|
||||||
/* Don't try to place road between tunnelbridge ends */
|
RoadBits bits = AxisToRoadBits(axis);
|
||||||
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
|
||||||
under_tunnelbridge = !under_tunnelbridge;
|
|
||||||
} else if (!under_tunnelbridge) {
|
|
||||||
RoadBits bits = AxisToRoadBits(axis);
|
|
||||||
|
|
||||||
/* Determine which road parts should be built. */
|
/* Determine which road parts should be built. */
|
||||||
if (!is_ai && start_tile != end_tile) {
|
if (!is_ai && start_tile != end_tile) {
|
||||||
/* Only build the first and last roadbit if they can connect to something. */
|
/* Only build the first and last roadbit if they can connect to something. */
|
||||||
if (tile == end_tile && !CanConnectToRoad(tile, rt, dir)) {
|
if (tile == end_tile && !CanConnectToRoad(tile, rt, dir)) {
|
||||||
bits = DiagDirToRoadBits(ReverseDiagDir(dir));
|
bits = DiagDirToRoadBits(ReverseDiagDir(dir));
|
||||||
} else if (tile == start_tile && !CanConnectToRoad(tile, rt, ReverseDiagDir(dir))) {
|
} else if (tile == start_tile && !CanConnectToRoad(tile, rt, ReverseDiagDir(dir))) {
|
||||||
bits = DiagDirToRoadBits(dir);
|
bits = DiagDirToRoadBits(dir);
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/* Road parts only have to be built at the start tile or at the end tile. */
|
|
||||||
if (tile == end_tile && !end_half) bits &= DiagDirToRoadBits(ReverseDiagDir(dir));
|
|
||||||
if (tile == start_tile && start_half) bits &= DiagDirToRoadBits(dir);
|
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
/* Road parts only have to be built at the start tile or at the end tile. */
|
||||||
|
if (tile == end_tile && !end_half) bits &= DiagDirToRoadBits(ReverseDiagDir(dir));
|
||||||
|
if (tile == start_tile && start_half) bits &= DiagDirToRoadBits(dir);
|
||||||
|
}
|
||||||
|
|
||||||
CommandCost ret = Command<CMD_BUILD_ROAD>::Do(flags, tile, bits, rt, drd, 0);
|
CommandCost ret = Command<CMD_BUILD_ROAD>::Do(flags, tile, bits, rt, drd, 0);
|
||||||
if (ret.Failed()) {
|
if (ret.Failed()) {
|
||||||
last_error = ret;
|
last_error = ret;
|
||||||
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) {
|
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) {
|
||||||
if (is_ai) return last_error;
|
if (is_ai) return last_error;
|
||||||
if (had_success) break; // Keep going if we haven't constructed any road yet, skipping the start of the drag
|
if (had_success) break; // Keep going if we haven't constructed any road yet, skipping the start of the drag
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
had_success = true;
|
||||||
|
/* Only pay for the upgrade on one side of the bridges and tunnels */
|
||||||
|
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
||||||
|
if (IsBridge(tile)) {
|
||||||
|
if (!had_bridge || GetTunnelBridgeDirection(tile) == dir) {
|
||||||
|
cost.AddCost(ret);
|
||||||
|
}
|
||||||
|
had_bridge = true;
|
||||||
|
} else { // IsTunnel(tile)
|
||||||
|
if (!had_tunnel || GetTunnelBridgeDirection(tile) == dir) {
|
||||||
|
cost.AddCost(ret);
|
||||||
|
}
|
||||||
|
had_tunnel = true;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
had_success = true;
|
cost.AddCost(ret);
|
||||||
/* Only pay for the upgrade on one side of the bridges and tunnels */
|
|
||||||
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
|
||||||
if (IsBridge(tile)) {
|
|
||||||
if (!had_bridge || GetTunnelBridgeDirection(tile) == dir) {
|
|
||||||
cost.AddCost(ret);
|
|
||||||
}
|
|
||||||
had_bridge = true;
|
|
||||||
} else { // IsTunnel(tile)
|
|
||||||
if (!had_tunnel || GetTunnelBridgeDirection(tile) == dir) {
|
|
||||||
cost.AddCost(ret);
|
|
||||||
}
|
|
||||||
had_tunnel = true;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
cost.AddCost(ret);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue