summaryrefslogtreecommitdiff
path: root/src/elrail.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-09-21 11:24:51 +0000
committerrubidium <rubidium@openttd.org>2014-09-21 11:24:51 +0000
commit9daf7e749ccb00873443e2261379bf31999664d9 (patch)
treec6121f8173938736242b84b2830058d330f1da9a /src/elrail.cpp
parent982f5a6aa2f600106f9bd292ebefcef52e6e65e6 (diff)
downloadopenttd-9daf7e749ccb00873443e2261379bf31999664d9.tar.xz
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
Diffstat (limited to 'src/elrail.cpp')
-rw-r--r--src/elrail.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp
index 8116bff2c..1927be03e 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -407,7 +407,7 @@ static void DrawCatenaryRailway(const TileInfo *ti)
* Remove those (simply by ANDing with allowed, since these markers are never allowed) */
if ((PPPallowed[i] & PPPpreferred[i]) != 0) PPPallowed[i] &= PPPpreferred[i];
- if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile)) {
+ if (IsBridgeAbove(ti->tile)) {
Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y;
int height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
@@ -446,7 +446,7 @@ static void DrawCatenaryRailway(const TileInfo *ti)
if (IsTunnelTile(ti->tile)) return;
/* Don't draw a wire under a low bridge */
- if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_BRIDGES)) {
+ if (IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_BRIDGES)) {
int height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
if (height <= GetTileMaxZ(ti->tile) + 1) return;