diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-04 10:28:20 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-04 10:28:20 +0000 |
| commit | d0689c2924bd0c8793a61dfc9407673b1810d051 (patch) | |
| tree | f9ff14ce87a9de6e9cbd4bfe89867096fd13c507 /src/road_cmd.cpp | |
| parent | 69162621d81c82b832cccc8d59179fc0e4472af2 (diff) | |
| download | openttd-d0689c2924bd0c8793a61dfc9407673b1810d051.tar.xz | |
(svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 43e51739a..4b506d912 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -1080,9 +1080,9 @@ void DrawTramCatenary(const TileInfo *ti, RoadBits tram) /* Don't draw the catenary under a low bridge */ if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_CATENARY)) { - uint height = GetBridgePixelHeight(GetNorthernBridgeEnd(ti->tile)); + uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); - if (height <= GetTileMaxPixelZ(ti->tile) + TILE_HEIGHT) return; + if (height <= GetTileMaxZ(ti->tile) + 1) return; } SpriteID front; @@ -1187,10 +1187,10 @@ static void DrawRoadBits(TileInfo *ti) /* Do not draw details (street lights, trees) under low bridge */ if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && (roadside == ROADSIDE_TREES || roadside == ROADSIDE_STREET_LIGHTS)) { - uint height = GetBridgePixelHeight(GetNorthernBridgeEnd(ti->tile)); - uint minz = GetTileMaxPixelZ(ti->tile) + 2 * TILE_HEIGHT; + uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); + uint minz = GetTileMaxZ(ti->tile) + 2; - if (roadside == ROADSIDE_TREES) minz += TILE_HEIGHT; + if (roadside == ROADSIDE_TREES) minz++; if (height < minz) return; } |