diff options
| author | frosch <frosch@openttd.org> | 2012-07-15 16:17:22 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-07-15 16:17:22 +0000 |
| commit | c8cb096533fbb943e455c5e4c2f13ffa2a007c8b (patch) | |
| tree | dd4c6d34c8d669e772c681f51d59a9c05736bb95 /src/elrail.cpp | |
| parent | 03b6ad93836c43f9be08468635fa0a914edbfe09 (diff) | |
| download | openttd-c8cb096533fbb943e455c5e4c2f13ffa2a007c8b.tar.xz | |
(svn r24402) -Fix [FS#5243]: Station properties 11 and 14 were combined incorrectly.
Diffstat (limited to 'src/elrail.cpp')
| -rw-r--r-- | src/elrail.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/elrail.cpp b/src/elrail.cpp index 9aedfc6e5..8aea17aae 100644 --- a/src/elrail.cpp +++ b/src/elrail.cpp @@ -111,7 +111,6 @@ static TrackBits GetRailTrackBitsUniversal(TileIndex t, byte *override) case MP_STATION: if (!HasStationRail(t)) return TRACK_BIT_NONE; if (!HasCatenary(GetRailType(t))) return TRACK_BIT_NONE; - if (!IsStationTileElectrifiable(t)) return TRACK_BIT_NONE; return TrackToTrackBits(GetRailStationTrack(t)); default: @@ -409,7 +408,8 @@ static void DrawCatenaryRailway(const TileInfo *ti) } } - if (PPPallowed[i] != 0 && HasBit(PCPstatus, i) && !HasBit(OverridePCP, i)) { + if (PPPallowed[i] != 0 && HasBit(PCPstatus, i) && !HasBit(OverridePCP, i) && + (!IsRailStationTile(ti->tile) || CanStationTileHavePylons(ti->tile))) { for (Direction k = DIR_BEGIN; k < DIR_END; k++) { byte temp = PPPorder[i][GetTLG(ti->tile)][k]; @@ -443,6 +443,9 @@ static void DrawCatenaryRailway(const TileInfo *ti) if (height <= GetTileMaxZ(ti->tile) + 1) return; } + /* Don't draw a wire if the station tile does not want any */ + if (IsRailStationTile(ti->tile) && !CanStationTileHaveWires(ti->tile)) return; + SpriteID wire_normal = GetWireBase(ti->tile); SpriteID wire_halftile = (halftile_corner != CORNER_INVALID) ? GetWireBase(ti->tile, TCX_UPPER_HALFTILE) : wire_normal; Track halftile_track; |