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/elrail.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/elrail.cpp')
| -rw-r--r-- | src/elrail.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp index eda206356..f8868bd4e 100644 --- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -401,9 +401,9 @@ static void DrawCatenaryRailway(const TileInfo *ti) if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile)) { Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y; - uint height = GetBridgePixelHeight(GetNorthernBridgeEnd(ti->tile)); + uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); - if ((height <= GetTileMaxPixelZ(ti->tile) + TILE_HEIGHT) && + if ((height <= GetTileMaxZ(ti->tile) + 1) && (i == PCPpositions[bridgetrack][0] || i == PCPpositions[bridgetrack][1])) { SetBit(OverridePCP, i); } @@ -438,9 +438,9 @@ static void DrawCatenaryRailway(const TileInfo *ti) /* Don't draw a wire 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 wire_normal = GetWireBase(ti->tile); |