cpp/openttd-patchpack/source Changeset - r19882:244089c4e96a

Changeset - r19882:244089c4e96a

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

michi_cc - 11 years ago 2012-12-21 18:51:10
michi_cc@openttd.org

(svn r24837) -Fix: Don't consider blocked rail station tiles that display wires as non-reachable for masking out unnecessary catenary wires.

1 file changed with 7 insertions and 3 deletions:

src/elrail.cpp

0 comments (0 inline, 0 general)

src/elrail.cpp

➞

Show inline comments

@@ @@ -129,9 +129,13 @@ static TrackBits MaskWireBits(TileIndex @@
 	for (DiagDirection d = DIAGDIR_BEGIN; d < DIAGDIR_END; d++) {
 		/* If the neighbor tile is either not electrified or has no tracks that can be reached
 		 * from this tile, mark all trackdirs that can be reached from the neighbour tile
 		 * as needing no catenary. */
 		RailType rt = GetTileRailType(TileAddByDiagDir(t, d));
 		if (rt == INVALID_RAILTYPE || !HasCatenary(rt) || (TrackStatusToTrackBits(GetTileTrackStatus(TileAddByDiagDir(t, d), TRANSPORT_RAIL, 0)) & DiagdirReachesTracks(d)) == TRACK_BIT_NONE) {
 		 * as needing no catenary. We make an exception for blocked station tiles with a matching
 		 * axis that still display wires to preserve visual continuity. */
 		TileIndex next_tile = TileAddByDiagDir(t, d);
 		RailType rt = GetTileRailType(next_tile);
 		if (rt == INVALID_RAILTYPE || !HasCatenary(rt) ||
 				((TrackStatusToTrackBits(GetTileTrackStatus(next_tile, TRANSPORT_RAIL, 0)) & DiagdirReachesTracks(d)) == TRACK_BIT_NONE &&
 				(!HasStationTileRail(next_tile) || GetRailStationAxis(next_tile) != DiagDirToAxis(d) || !CanStationTileHaveWires(next_tile)))) {
 			neighbour_tdb |= DiagdirReachesTrackdirs(ReverseDiagDir(d));
+		}
+	}

0 comments (0 inline, 0 general)