From 386a3f1d208a67af646da9a0bedba375858f822c Mon Sep 17 00:00:00 2001 From: smatz Date: Thu, 8 May 2008 16:48:29 +0000 Subject: (svn r13016) -Codechange: unify the detection if rail catenary should be drawn --- src/tunnelbridge_cmd.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/tunnelbridge_cmd.cpp') diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index a95c3bfbc..96c57833c 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -39,6 +39,7 @@ #include "economy_func.h" #include "rail.h" #include "cheat_func.h" +#include "elrail_func.h" #include "landscape_type.h" #include "table/sprites.h" @@ -887,7 +888,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti) AddSortableSpriteToDraw(SPR_TRAMWAY_TUNNEL_WIRES + tunnelbridge_direction, PAL_NONE, ti->x, ti->y, BB_data[10], BB_data[11], TILE_HEIGHT, ti->z, IsTransparencySet(TO_CATENARY), BB_data[8], BB_data[9], BB_Z_SEPARATOR); } } - } else if (!IsInvisibilitySet(TO_CATENARY) && HasCatenary(GetRailType(ti->tile))) { + } else if (HasCatenaryDrawn(GetRailType(ti->tile))) { catenary = true; StartSpriteCombine(); DrawCatenaryOnTunnel(ti); @@ -960,7 +961,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti) DrawBridgeTramBits(ti->x, ti->y, z, offset, HasBit(rts, ROADTYPE_ROAD), true); } EndSpriteCombine(); - } else if (HasCatenary(GetRailType(ti->tile))) { + } else if (HasCatenaryDrawn(GetRailType(ti->tile))) { DrawCatenary(ti); } @@ -1088,7 +1089,7 @@ void DrawBridgeMiddle(const TileInfo* ti) EndSpriteCombine(); StartSpriteCombine(); } - } else if (HasCatenary(GetRailType(rampsouth))) { + } else if (HasCatenaryDrawn(GetRailType(rampsouth))) { DrawCatenaryOnBridge(ti); } -- cgit v1.2.3-70-g09d2