cpp/openttd-patchpack/source Changeset - r23370:33c8101bb160

Changeset - r23370:33c8101bb160

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

SamuXarick - 5 years ago 2019-02-28 17:45:17
43006711+SamuXarick@users.noreply.github.com

Change: Allow towns to build bridges over rails and one-way roads. (#7291)

1 file changed with 4 insertions and 4 deletions:

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -1080,14 +1080,14 @@ static bool GrowTownWithBridge(const Tow @@
 	const int delta = TileOffsByDiagDir(bridge_dir);
 	if (slope == SLOPE_FLAT) {
 		/* Bridges starting on flat tiles are only allowed when crossing rivers. */
+		/* Bridges starting on flat tiles are only allowed when crossing rivers, rails or one-way roads. */
 		do {
 			if (bridge_length++ >= 4) {
 				/* Allow to cross rivers, not big lakes. */
+				/* Allow to cross rivers, not big lakes, nor large amounts of rails or one-way roads. */
 				return false;
+			}
 			bridge_tile += delta;
 		} while (IsValidTile(bridge_tile) && IsWaterTile(bridge_tile) && !IsSea(bridge_tile));
+		} while (IsValidTile(bridge_tile) && ((IsWaterTile(bridge_tile) && !IsSea(bridge_tile)) || IsPlainRailTile(bridge_tile) || (IsNormalRoadTile(bridge_tile) && GetDisallowedRoadDirections(bridge_tile) != DRD_NONE)));
 	} else {
 		do {
 			if (bridge_length++ >= 11) {
@@ @@ -1095,7 +1095,7 @@ static bool GrowTownWithBridge(const Tow @@
 				return false;
+			}
 			bridge_tile += delta;
 		} while (IsValidTile(bridge_tile) && IsWaterTile(bridge_tile));
+		} while (IsValidTile(bridge_tile) && (IsWaterTile(bridge_tile) || IsPlainRailTile(bridge_tile) || (IsNormalRoadTile(bridge_tile) && GetDisallowedRoadDirections(bridge_tile) != DRD_NONE)));
+	}
 	/* no water tiles in between? */

0 comments (0 inline, 0 general)