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

(svn r9912) -Fix: the AIs could build any road(station)s.

Browse Source
This commit is contained in:
rubidium
2007-05-24 21:45:54 +00:00
parent c5a3dcb3f0
commit 3d143446ee
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,17 +237,10 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
if (IsTunnel(atile)) {
if (GetTunnelDirection(atile) != i) continue;
} else {
if ((_m[atile].m5 & 1) != DiagDirToAxis(i)) continue;
if (GetBridgeRampDirection(atile) != i) continue;
}
}
}
// But also if we are on a bridge, we can only move a certain direction
if (!PathFinderInfo->rail_or_road && IsRoad(ctile)) {
if (IsTileType(ctile, MP_TUNNELBRIDGE)) {
// An existing bridge/tunnel... let's test the direction ;)
if ((_m[ctile].m5 & 1) != (i & 1)) continue;
}
}
if ((AI_PATHFINDER_FLAG_BRIDGE & current->path.node.user_data[0]) != 0 ||
(AI_PATHFINDER_FLAG_TUNNEL & current->path.node.user_data[0]) != 0) {
@@ -291,9 +284,9 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr
dir = 0;
} else {
// It already has road.. check if we miss any bits!
if ((_m[ctile].m5 & dir) != dir) {
if ((GetRoadBits(ctile, ROADTYPE_ROAD) & dir) != dir) {
// We do miss some pieces :(
dir &= ~_m[ctile].m5;
dir &= ~GetRoadBits(ctile, ROADTYPE_ROAD);
} else {
dir = 0;
}