mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r7684) -Backport from trunk (r7620): 

- Bad signal update through incompatible rail types, bridge.
release/0.5
Darkvater 2006-12-31 00:52:33 +00:00
parent 75c538962d
commit 99096b83bd
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
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; uint bits = 0;
int i; int i;
RememberData rd; RememberData rd;
TileIndex tile_org = tile; TileIndex tile_org = tile;
@ -276,33 +276,54 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
} }
tile += TileOffsByDiagDir(direction); tile += TileOffsByDiagDir(direction);
/* Check in case of rail if the owner is the same */ /* 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) { if (tpf->tracktype == TRANSPORT_RAIL) {
// don't enter train depot from the back /* don't enter train depot from the back */
if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == direction) return; if (IsTileDepotType(tile, TRANSPORT_RAIL) && GetRailDepotDirection(tile) == direction) goto no_way;
/* Check in case of rail if the owner is the same */
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)) if (GetTileOwner(tile_org) != GetTileOwner(tile)) goto no_way;
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;
} }
// check if the new tile can be entered from that direction if (IsTileType(tile, MP_TUNNELBRIDGE)) {
if (tpf->tracktype == TRANSPORT_ROAD) { if (IsTunnel(tile)) {
// road stops and depots now have a track (r4419) /* tunnel hole can be entered only from one direction */
// don't enter road stop from the back if (GetTunnelDirection(tile) != direction) goto no_way;
if (IsRoadStopTile(tile) && ReverseDiagDir(GetRoadStopDir(tile)) != direction) return;
// don't enter road depot from the back
if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return;
} }
}
if (tpf->tracktype == TRANSPORT_RAIL) {
/* 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 */
bits = GetTileTrackStatus(tile, tpf->tracktype);
no_way:
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);