diff options
Diffstat (limited to 'src/ai/trolly')
| -rw-r--r-- | src/ai/trolly/build.cpp | 2 | ||||
| -rw-r--r-- | src/ai/trolly/pathfinder.cpp | 6 | ||||
| -rw-r--r-- | src/ai/trolly/trolly.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/ai/trolly/build.cpp b/src/ai/trolly/build.cpp index 41c80529c..6d5e9a32f 100644 --- a/src/ai/trolly/build.cpp +++ b/src/ai/trolly/build.cpp @@ -199,7 +199,7 @@ CommandCost AiNew_Build_RoutePart(Player *p, Ai_PathFinderInfo *PathFinderInfo, // Build the tile res = AI_DoCommand(route[part], dir, 0, flag | DC_NO_WATER, CMD_BUILD_ROAD); // Currently, we ignore CMD_ERRORs! - if (CmdFailed(res) && flag == DC_EXEC && !IsTileType(route[part], MP_STREET) && !EnsureNoVehicle(route[part])) { + if (CmdFailed(res) && flag == DC_EXEC && !IsTileType(route[part], MP_ROAD) && !EnsureNoVehicle(route[part])) { // Problem.. let's just abort it all! DEBUG(ai, 0, "[BuidPath] route building failed at tile 0x%X, aborting", route[part]); p->ainew.state = AI_STATE_NOTHING; diff --git a/src/ai/trolly/pathfinder.cpp b/src/ai/trolly/pathfinder.cpp index bea1858f1..7277cf4c2 100644 --- a/src/ai/trolly/pathfinder.cpp +++ b/src/ai/trolly/pathfinder.cpp @@ -41,8 +41,8 @@ static bool TestCanBuildStationHere(TileIndex tile, byte dir) static bool IsRoad(TileIndex tile) { return - // MP_STREET, but not a road depot? - (IsTileType(tile, MP_STREET) && !IsTileDepotType(tile, TRANSPORT_ROAD)) || + // MP_ROAD, but not a road depot? + (IsTileType(tile, MP_ROAD) && !IsTileDepotType(tile, TRANSPORT_ROAD)) || (IsTileType(tile, MP_TUNNELBRIDGE) && ( (IsTunnel(tile) && GetTunnelTransportType(tile) == TRANSPORT_ROAD) || (IsBridge(tile) && GetBridgeTransportType(tile) == TRANSPORT_ROAD) @@ -319,7 +319,7 @@ static void AyStar_AiPathFinder_GetNeighbours(AyStar *aystar, OpenListNode *curr // Bridges can only be build on land that is not flat // And if there is a road or rail blocking if (tileh != SLOPE_FLAT || - (PathFinderInfo->rail_or_road && IsTileType(tile + TileOffsByDiagDir(dir), MP_STREET)) || + (PathFinderInfo->rail_or_road && IsTileType(tile + TileOffsByDiagDir(dir), MP_ROAD)) || (!PathFinderInfo->rail_or_road && IsTileType(tile + TileOffsByDiagDir(dir), MP_RAILWAY))) { for (;;) { new_tile += TileOffsByDiagDir(dir); diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index 36cb793da..eb79d6f5e 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -800,7 +800,7 @@ static void AiNew_State_FindDepot(Player *p) for (j = DIAGDIR_BEGIN; j < DIAGDIR_END; j++) { TileIndex t = tile + TileOffsByDiagDir(j); - if (IsTileType(t, MP_STREET) && + if (IsTileType(t, MP_ROAD) && GetRoadTileType(t) == ROAD_TILE_DEPOT && IsTileOwner(t, _current_player) && GetRoadDepotDirection(t) == ReverseDiagDir(j)) { @@ -1101,7 +1101,7 @@ static void AiNew_State_BuildDepot(Player *p) CommandCost res; assert(p->ainew.state == AI_STATE_BUILD_DEPOT); - if (IsTileType(p->ainew.depot_tile, MP_STREET) && GetRoadTileType(p->ainew.depot_tile) == ROAD_TILE_DEPOT) { + if (IsTileType(p->ainew.depot_tile, MP_ROAD) && GetRoadTileType(p->ainew.depot_tile) == ROAD_TILE_DEPOT) { if (IsTileOwner(p->ainew.depot_tile, _current_player)) { // The depot is already built p->ainew.state = AI_STATE_BUILD_VEHICLE; |