mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r7963) -Backport from trunk (r7716, r7717, r7718): 

- Bad signal propagation through tunnel-ends, incompatible railtype signal propagation
 still possible (not fixed).
This commit is contained in:
Darkvater 2007-01-07 14:10:56 +00:00
parent 0bf1d6c49d
commit 315ec78344
1 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
pathfind.c
View File

@ -253,7 +253,7 @@ const byte _ffb_64[128] = {
static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction) static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
{ {
uint bits = 0; uint bits;
int i; int i;
RememberData rd; RememberData rd;
TileIndex tile_org = tile; TileIndex tile_org = tile;
@ -276,54 +276,42 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
} }
tile += TileOffsByDiagDir(direction); tile += TileOffsByDiagDir(direction);
/* check if the new tile can be entered from that direction */
/* Inside this block we should not use 'return' to indicate 'no way' condition (at least for rail transport type) */
if (tpf->tracktype == TRANSPORT_ROAD || tpf->tracktype == TRANSPORT_RAIL) {
if (tpf->tracktype == TRANSPORT_RAIL) {
/* don't enter train depot from the back */
if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == direction) goto no_way;
/* Check in case of rail if the owner is the same */ /* Check in case of rail if the owner is the same */
if (tpf->tracktype == TRANSPORT_RAIL) {
// don't enter train depot from the back
if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == direction) return;
if (IsTileType(tile_org, MP_RAILWAY) || IsTileType(tile_org, MP_STATION) || IsTileType(tile_org, MP_TUNNELBRIDGE)) 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 (IsTileType(tile, MP_RAILWAY) || IsTileType(tile, MP_STATION) || IsTileType(tile, MP_TUNNELBRIDGE))
/* Check if we are on a bridge (middle parts don't have an owner */ /* Check if we are on a bridge (middle parts don't have an owner */
if (!IsBridgeTile(tile) || !IsBridgeMiddle(tile)) if (!IsBridgeTile(tile) || !IsBridgeMiddle(tile))
if (!IsBridgeTile(tile_org) || !IsBridgeMiddle(tile_org)) if (!IsBridgeTile(tile_org) || !IsBridgeMiddle(tile_org))
if (GetTileOwner(tile_org) != GetTileOwner(tile)) goto no_way; if (GetTileOwner(tile_org) != GetTileOwner(tile))
return;
} else if (tpf->tracktype == TRANSPORT_ROAD) {
/* road stops and depots now have a track (r4419) */
/* don't enter road stop from the back */
if (IsRoadStopTile(tile) && ReverseDiagDir(GetRoadStopDir(tile)) != direction) goto no_way;
/* don't enter road depot from the back */
if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) goto no_way;
} }
if (IsTileType(tile, MP_TUNNELBRIDGE)) { // check if the new tile can be entered from that direction
if (IsTunnel(tile)) { if (tpf->tracktype == TRANSPORT_ROAD) {
/* tunnel hole can be entered only from one direction */ // road stops and depots now have a track (r4419)
if (GetTunnelDirection(tile) != direction) goto no_way; // don't enter road stop from the back
} if (IsRoadStopTile(tile) && ReverseDiagDir(GetRoadStopDir(tile)) != direction) return;
} // don't enter road depot from the back
if (tpf->tracktype == TRANSPORT_RAIL) { if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return;
/* check for the rail type compatibility */
Trackdir td = DiagdirToDiagTrackdir(direction);
RailType type_org = GetTileRailType(tile_org, td);
RailType type = GetTileRailType(tile, td);
if (type != type_org) {
// they can be compatible only if one is normal and the other one is elrail
if (type_org == RAILTYPE_RAIL && type != RAILTYPE_ELECTRIC) goto no_way;
if (type == RAILTYPE_RAIL && type_org != RAILTYPE_ELECTRIC) goto no_way;
}
}
} }
/* the next line is skipped when the new tile can't be entered from tile_org */ /* Check if the new tile is a tunnel or bridge head and that the direction
bits = GetTileTrackStatus(tile, tpf->tracktype); * and transport type match */
no_way: if (IsTileType(tile, MP_TUNNELBRIDGE) && IsTunnel(tile)) {
if (GetTunnelDirection(tile) != direction ||
GetTunnelTransportType(tile) != tpf->tracktype) {
return;
}
}
tpf->rd.cur_length++; tpf->rd.cur_length++;
bits = GetTileTrackStatus(tile, tpf->tracktype);
if ((byte)bits != tpf->var2) { if ((byte)bits != tpf->var2) {
bits &= _tpfmode1_and[direction]; bits &= _tpfmode1_and[direction];
bits = bits | (bits>>8); bits = bits | (bits>>8);
@ -360,8 +348,8 @@ no_way:
if (tpf->hasbit_13) if (tpf->hasbit_13)
return; return;
tile = tile_org;
direction = ReverseDiagDir(direction); direction = ReverseDiagDir(direction);
tile += TileOffsByDiagDir(direction);
bits = GetTileTrackStatus(tile, tpf->tracktype); bits = GetTileTrackStatus(tile, tpf->tracktype);
bits |= (bits >> 8); bits |= (bits >> 8);