dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642

Browse Source
This commit is contained in:
smatz
2007-12-16 19:30:42 +00:00
parent cdee7d4cb8
commit d56a690ba4
15 changed files with 84 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ai/trolly/pathfinder.cpp
View File

@@ -45,10 +45,7 @@ static bool IsRoad(TileIndex tile)
return
// MP_ROAD, but not a road depot?
(IsTileType(tile, MP_ROAD) && !IsTileDepotType(tile, TRANSPORT_ROAD)) ||
(IsTileType(tile, MP_TUNNELBRIDGE) && (
(IsTunnel(tile) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD) ||
(IsBridge(tile) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD)
));
(IsTileType(tile, MP_TUNNELBRIDGE) && GetTunnelBridgeTransportType(tile) == TRANSPORT_ROAD);
}
@@ -236,11 +233,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
// If the next step is a bridge, we have to enter it the right way
if (!PathFinderInfo->rail_or_road && IsRoad(atile)) {
if (IsTileType(atile, MP_TUNNELBRIDGE)) {
if (IsTunnel(atile)) {
if (GetTunnelBridgeDirection(atile) != i) continue;
} else {
if (GetTunnelBridgeDirection(atile) != i) continue;
}
if (GetTunnelBridgeDirection(atile) != i) continue;
}
}