cpp/openttd-patchpack/source Changeset - r8397:b101adb0f649

Changeset - r8397:b101adb0f649

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 16 years ago 2008-01-23 20:02:30
smatz@openttd.org

(svn r11967) -Fix (r1400): MP_ROAD can have railbits too - OPF searching over rail of diffent owner behind crossing

1 file changed with 9 insertions and 9 deletions:

src/pathfind.cpp

0 comments (0 inline, 0 general)

src/pathfind.cpp

➞

Show inline comments

@@ @@ -277,13 +277,6 @@ static void TPFMode1(TrackPathFinder* tp @@
 	/* can we enter tile in this dir? */
 	if (!CanAccessTileInDir(tile, ReverseDiagDir(direction), tpf->tracktype)) return;
 	/* Check in case of rail if the owner is the same */
 	if (tpf->tracktype == TRANSPORT_RAIL) {
 		if (IsTileType(tile_org, MP_RAILWAY) || IsTileType(tile_org, MP_STATION) || IsTileType(tile_org, MP_TUNNELBRIDGE))
 			if (IsTileType(tile, MP_RAILWAY) || IsTileType(tile, MP_STATION) || IsTileType(tile, MP_TUNNELBRIDGE))
 				if (GetTileOwner(tile_org) != GetTileOwner(tile)) return;
+	}
 	/* Check if the new tile is a tunnel or bridge head and that the direction
 	 * and transport type match */
 	if (IsTileType(tile, MP_TUNNELBRIDGE)) {
@@ @@ -293,9 +286,16 @@ static void TPFMode1(TrackPathFinder* tp @@
+		}
+	}
-	tpf->rd.cur_length++;
+	uint32 bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type);
 	uint bits = GetTileTrackStatus(tile, tpf->tracktype, tpf->sub_type);
 	/* Check in case of rail if the owner is the same */
 	if (tpf->tracktype == TRANSPORT_RAIL) {
 		if (bits != 0 && GetTileTrackStatus(tile_org, TRANSPORT_RAIL, 0) != 0) {
 			if (GetTileOwner(tile_org) != GetTileOwner(tile)) return;
+		}
+	}
 	tpf->rd.cur_length++;
 	if ((byte)bits != tpf->var2) {
 		bits &= _tpfmode1_and[direction];

0 comments (0 inline, 0 general)