Revert #11606: Don't auto-build past tunnelbridge ends

This reverts commit 59f6c199bf.

src/rail_cmd.cpp

@@ -886,32 +886,22 @@ static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, TileI
 	if (ret.Failed()) return ret;
 
 	bool had_success = false;
-	bool under_tunnelbridge = false;
 	CommandCost last_error = CMD_ERROR;
 	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;
-		} else if (!under_tunnelbridge) {
-			if (remove) {
-				ret = Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir));
-			} else {
-				ret = Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals);
-			}
-
-			if (ret.Failed()) {
-				last_error = 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 (ret.Failed()) {
-				if (last_error.GetErrorMessage() == STR_ERROR_OWNED_BY && remove) break;
+			last_error = ret;
-			} else {
+			if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
-				had_success = true;
+				if (fail_on_obstacle) return last_error;
-				total_cost.AddCost(ret);
+				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);
 		}
 
 		if (tile == end_tile) break;

src/road_cmd.cpp

@@ -1007,55 +1007,49 @@ CommandCost CmdBuildLongRoad(DoCommandFlag flags, TileIndex end_tile, TileIndex
 	bool had_bridge = false;
 	bool had_tunnel = false;
 	bool had_success = false;
-	bool under_tunnelbridge = false;
 
 	/* Start tile is the first tile clicked by the user. */
 	for (;;) {
-		/* Don't try to place road between tunnelbridge ends */
+		RoadBits bits = AxisToRoadBits(axis);
-		if (IsTileType(tile, MP_TUNNELBRIDGE)) {
+
-			under_tunnelbridge = !under_tunnelbridge;
+		/* Determine which road parts should be built. */
-		} else if (!under_tunnelbridge) {
+		if (!is_ai && start_tile != end_tile) {
-			RoadBits bits = AxisToRoadBits(axis);
+			/* Only build the first and last roadbit if they can connect to something. */
-
+			if (tile == end_tile && !CanConnectToRoad(tile, rt, dir)) {
-			/* Determine which road parts should be built. */
+				bits = DiagDirToRoadBits(ReverseDiagDir(dir));
-			if (!is_ai && start_tile != end_tile) {
+			} else if (tile == start_tile && !CanConnectToRoad(tile, rt, ReverseDiagDir(dir))) {
-				/* Only build the first and last roadbit if they can connect to something. */
+				bits = DiagDirToRoadBits(dir);
-				if (tile == end_tile && !CanConnectToRoad(tile, rt, dir)) {
-					bits = DiagDirToRoadBits(ReverseDiagDir(dir));
-				} else if (tile == start_tile && !CanConnectToRoad(tile, rt, ReverseDiagDir(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 {
+		} else {
-				had_success = true;
+			had_success = true;
-				/* Only pay for the upgrade on one side of the bridges and tunnels */
+			/* Only pay for the upgrade on one side of the bridges and tunnels */
-				if (IsTileType(tile, MP_TUNNELBRIDGE)) {
+			if (IsTileType(tile, MP_TUNNELBRIDGE)) {
-					if (IsBridge(tile)) {
+				if (IsBridge(tile)) {
-						if (!had_bridge || GetTunnelBridgeDirection(tile) == dir) {
+					if (!had_bridge || GetTunnelBridgeDirection(tile) == dir) {
-							cost.AddCost(ret);
+						cost.AddCost(ret);
-						}
-						had_bridge = true;
-					} else { // IsTunnel(tile)
-						if (!had_tunnel || GetTunnelBridgeDirection(tile) == dir) {
-							cost.AddCost(ret);
-						}
-						had_tunnel = true;
 					}
-				} else {
+					had_bridge = true;
-					cost.AddCost(ret);
+				} else { // IsTunnel(tile)
+					if (!had_tunnel || GetTunnelBridgeDirection(tile) == dir) {
+						cost.AddCost(ret);
+					}
+					had_tunnel = true;
 				}
+			} else {
+				cost.AddCost(ret);
 			}
 		}