diff options
| author | rubidium <rubidium@openttd.org> | 2014-09-21 11:24:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-09-21 11:24:51 +0000 |
| commit | 9daf7e749ccb00873443e2261379bf31999664d9 (patch) | |
| tree | c6121f8173938736242b84b2830058d330f1da9a /src/town_cmd.cpp | |
| parent | 982f5a6aa2f600106f9bd292ebefcef52e6e65e6 (diff) | |
| download | openttd-9daf7e749ccb00873443e2261379bf31999664d9.tar.xz | |
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
Diffstat (limited to 'src/town_cmd.cpp')
| -rw-r--r-- | src/town_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 1c6a01eae..8c86475ef 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -868,7 +868,7 @@ static bool IsRoadAllowedHere(Town *t, TileIndex tile, DiagDirection dir) if (DistanceFromEdge(tile) == 0) return false; /* Prevent towns from building roads under bridges along the bridge. Looks silly. */ - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile) && GetBridgeAxis(tile) == DiagDirToAxis(dir)) return false; + if (IsBridgeAbove(tile) && GetBridgeAxis(tile) == DiagDirToAxis(dir)) return false; /* Check if there already is a road at this point? */ if (GetTownRoadBits(tile) == ROAD_NONE) { @@ -2018,7 +2018,7 @@ static inline bool CanBuildHouseHere(TileIndex tile, TownID town, bool noslope) if ((noslope && slope != SLOPE_FLAT) || IsSteepSlope(slope)) return false; /* building under a bridge? */ - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return false; + if (IsBridgeAbove(tile)) return false; /* do not try to build over house owned by another town */ if (IsTileType(tile, MP_HOUSE) && GetTownIndex(tile) != town) return false; @@ -2790,7 +2790,7 @@ static bool SearchTileForStatue(TileIndex tile, void *user_data) /* Statues can be build on slopes, just like houses. Only the steep slopes is a no go. */ if (IsSteepSlope(GetTileSlope(tile))) return false; /* Don't build statues under bridges. */ - if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) return false; + if (IsBridgeAbove(tile)) return false; /* A clear-able open space is always preferred. */ if ((IsTileType(tile, MP_CLEAR) || IsTileType(tile, MP_TREES)) && TryClearTile(tile)) { |