From 5f84ddf1508b1a55e6f7a275cbb1bf1705b71916 Mon Sep 17 00:00:00 2001 From: frosch Date: Thu, 11 Sep 2008 19:44:30 +0000 Subject: (svn r14292) -Cleanup (r11128): Move an 'if' out of a loop as it does not need to be iterated. (spotted by smatz) --- src/elrail.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/elrail.cpp b/src/elrail.cpp index e4fbbec59..7558c9ded 100644 --- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -346,6 +346,9 @@ static void DrawCatenaryRailway(const TileInfo *ti) } } + /* The wire above the tunnel is drawn together with the tunnel-roof (see DrawCatenaryOnTunnel()) */ + if (IsTunnelTile(ti->tile)) return; + /* Don't draw a wire under a low bridge */ if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_CATENARY)) { uint height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile)); @@ -356,7 +359,6 @@ static void DrawCatenaryRailway(const TileInfo *ti) /* Drawing of pylons is finished, now draw the wires */ for (Track t = TRACK_BEGIN; t < TRACK_END; t++) { if (HasBit(trackconfig[TS_HOME], t)) { - if (IsTunnelTile(ti->tile)) break; // drawn together with tunnel-roof (see DrawCatenaryOnTunnel()) byte PCPconfig = HasBit(PCPstatus, PCPpositions[t][0]) + (HasBit(PCPstatus, PCPpositions[t][1]) << 1); -- cgit v1.2.3-54-g00ecf