diff options
| author | frosch <frosch@openttd.org> | 2008-02-14 15:59:16 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-02-14 15:59:16 +0000 |
| commit | 514df81e27398309532f7523ee1c7df86fe3043d (patch) | |
| tree | a43464406df621d20a7dd83755ef86ae3474e9ea /src/ai/default | |
| parent | 6c932166414ac0164fc53658b880d5b05a9d7a7e (diff) | |
| download | openttd-514df81e27398309532f7523ee1c7df86fe3043d.tar.xz | |
(svn r12141) -Codechange: Introduce IsNormalRoad[Tile](), IsRoadDepot[Tile]() and HasTileRoadType(); and use them.
Diffstat (limited to 'src/ai/default')
| -rw-r--r-- | src/ai/default/default.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 95fab9619..077e2a849 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -2639,8 +2639,7 @@ static CommandCost AiDoBuildDefaultRoadBlock(TileIndex tile, const AiDefaultBloc _cleared_town = NULL; if (p->mode == 2) { - if (IsTileType(c, MP_ROAD) && - GetRoadTileType(c) == ROAD_TILE_NORMAL && + if (IsNormalRoadTile(c) && (GetRoadBits(c, ROADTYPE_ROAD) & p->attr) != 0) { roadflag |= 2; @@ -2682,7 +2681,7 @@ clear_town_stuff:; if (GetTileSlope(c, NULL) != SLOPE_FLAT) return CMD_ERROR; - if (!IsTileType(c, MP_ROAD) || GetRoadTileType(c) != ROAD_TILE_NORMAL) { + if (!IsNormalRoadTile(c)) { ret = DoCommand(c, 0, 0, flag | DC_AUTO | DC_NO_WATER | DC_AI_BUILDING, CMD_LANDSCAPE_CLEAR); if (CmdFailed(ret)) return CMD_ERROR; } @@ -2857,7 +2856,7 @@ static bool AiEnumFollowRoad(TileIndex tile, AiRoadEnum *a, int track, uint leng if (dist <= a->best_dist) { TileIndex tile2 = TILE_MASK(tile + TileOffsByDiagDir(_dir_by_track[track])); - if (IsTileType(tile2, MP_ROAD) && GetRoadTileType(tile2) == ROAD_TILE_NORMAL) { + if (IsNormalRoadTile(tile2)) { a->best_dist = dist; a->best_tile = tile; a->best_track = track; @@ -3740,7 +3739,7 @@ pos_3: if (IsLevelCrossing(tile)) goto is_rail_crossing; - if (GetRoadTileType(tile) == ROAD_TILE_DEPOT) { + if (IsRoadDepot(tile)) { DiagDirection dir; TileIndex t; |