dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12853) -Fix: catenary on tunnel entrances and middle bridge pieces was drawn twice in some cases

Browse Source
This commit is contained in:
smatz
2008-04-23 19:47:23 +00:00
parent ccfe024a2a
commit 459259aeec
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/elrail.cpp
View File

@@ -377,8 +377,13 @@ static void DrawCatenaryRailway(const TileInfo *ti)
}
}
static void DrawCatenaryOnBridge(const TileInfo *ti)
void DrawCatenaryOnBridge(const TileInfo *ti)
{
if (_patches.disable_elrails) return;
/* Do not draw catenary if it is invisible */
if (IsInvisibilitySet(TO_CATENARY)) return;
TileIndex end = GetSouthernBridgeEnd(ti->tile);
TileIndex start = GetOtherBridgeEnd(end);
@@ -437,14 +442,6 @@ void DrawCatenary(const TileInfo *ti)
/* Do not draw catenary if it is invisible */
if (IsInvisibilitySet(TO_CATENARY)) return;
if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile)) {
TileIndex head = GetNorthernBridgeEnd(ti->tile);
if (GetTunnelBridgeTransportType(head) == TRANSPORT_RAIL && HasCatenary(GetRailType(head))) {
DrawCatenaryOnBridge(ti);
}
}
switch (GetTileType(ti->tile)) {
case MP_RAILWAY:
if (IsRailDepot(ti->tile)) {