From d0689c2924bd0c8793a61dfc9407673b1810d051 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 4 Nov 2011 10:28:20 +0000 Subject: (svn r23097) -Codechange: remove pointless multiplications by TILE_HEIGHT from the bridge code --- src/road_cmd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/road_cmd.cpp') 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; } -- cgit v1.2.3-54-g00ecf