diff options
| author | tron <tron@openttd.org> | 2006-03-16 15:16:27 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-16 15:16:27 +0000 |
| commit | b8da06ddb11f234451864e0b454163ebb546e4cd (patch) | |
| tree | 79a0e9518fd43cbe914bddcaebf4983201598bc8 /ai/trolly/pathfinder.c | |
| parent | d6134455a5aaa7b247545886be573a555cdfc2be (diff) | |
| download | openttd-b8da06ddb11f234451864e0b454163ebb546e4cd.tar.xz | |
(svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX
Diffstat (limited to 'ai/trolly/pathfinder.c')
| -rw-r--r-- | ai/trolly/pathfinder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ai/trolly/pathfinder.c b/ai/trolly/pathfinder.c index 128351f32..25b3683ad 100644 --- a/ai/trolly/pathfinder.c +++ b/ai/trolly/pathfinder.c @@ -2,6 +2,7 @@ #include "../../stdafx.h" #include "../../openttd.h" +#include "../../bridge_map.h" #include "../../debug.h" #include "../../functions.h" #include "../../map.h" @@ -44,8 +45,7 @@ static bool IsRoad(TileIndex tile) (IsTileType(tile, MP_STREET) && !IsTileDepotType(tile, TRANSPORT_ROAD)) || (IsTileType(tile, MP_TUNNELBRIDGE) && ( (IsTunnel(tile) && GetTunnelTransportType(tile) == TRANSPORT_ROAD) || - // road bridge? - ((_m[tile].m5 & 0x80) != 0 && (_m[tile].m5 & 0x2) == 0x2) + (IsBridge(tile) && GetBridgeTransportType(tile) == TRANSPORT_ROAD) )); } @@ -234,7 +234,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr if (IsTunnel(atile)) { if (GetTunnelDirection(atile) != i) continue; } else { - if ((_m[atile].m5 & 1U) != DiagDirToAxis(i)) continue; + if (GetBridgeRampDirection(atile) != i) continue; } } } |