From cc0966405b3dc39a762e54ec0895ad3f346c53ab Mon Sep 17 00:00:00 2001 From: matthijs Date: Sun, 6 Feb 2005 22:36:08 +0000 Subject: (svn r1834) - Fix: NPF does not check the owner of its target, busses try to enter other players' depots. TODO - Add: asserts to find the v->u.rail.track == 0 problem. - Add: IsValidDepot(), IsValidTown(), IsValidSign(), IsValidVehicle(), IsValidStation() - Add: GetTileOwner(), IsTileOwner() - Codechange: Replaced IsShipDepotTile(), IsTrainDepotTile(), IsRoadDepotTile() by IsTileDepotType(). - Codechange: typedeffed the MAP_OWNERS as Owner. Should be used as variable type. - Codechange: Replaced a few uint by TileIndex. --- ai_pathfinder.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ai_pathfinder.c') diff --git a/ai_pathfinder.c b/ai_pathfinder.c index 1a4dcd684..14d648786 100644 --- a/ai_pathfinder.c +++ b/ai_pathfinder.c @@ -5,6 +5,7 @@ #include "tile.h" #include "command.h" #include "ai.h" +#include "depot.h" #define TEST_STATION_NO_DIR 0xFF @@ -35,7 +36,7 @@ static bool IsRoad(TileIndex tile) { return // MP_STREET, but not a road depot? - (IsTileType(tile, MP_STREET) && !(_map5[tile] & 0x20)) || + (IsTileType(tile, MP_STREET) && !(IsTileDepotType(tile, TRANSPORT_ROAD))) || (IsTileType(tile, MP_TUNNELBRIDGE) && ( // road tunnel? ((_map5[tile] & 0x80) == 0 && (_map5[tile] & 0x4) == 0x4) || -- cgit v1.2.3-54-g00ecf