cpp/openttd-patchpack/source Changeset - r9034:7ec68c39aca3

Changeset - r9034:7ec68c39aca3

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

smatz - 16 years ago 2008-04-23 19:47:23
smatz@openttd.org

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

3 files changed with 8 insertions and 12 deletions:

src/elrail.cpp

src/rail.h

src/tunnelbridge_cmd.cpp

0 comments (0 inline, 0 general)

src/elrail.cpp

➞

Show inline comments

@@ @@ -377,8 +377,13 @@ static void DrawCatenaryRailway(const 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)) {

src/rail.h

➞

Show inline comments

@@ @@ -216,6 +216,7 @@ static inline bool HasCatenary(RailType @@
  */
 void DrawCatenary(const TileInfo *ti);
 void DrawCatenaryOnTunnel(const TileInfo *ti);
 void DrawCatenaryOnBridge(const TileInfo *ti);
 Foundation GetRailFoundation(Slope tileh, TrackBits bits);

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -886,8 +886,6 @@ static void DrawTile_TunnelBridge(TileIn @@
+				}
+			}
 		} else if (!IsInvisibilitySet(TO_CATENARY) && HasCatenary(GetRailType(ti->tile))) {
 			DrawCatenary(ti);
 			catenary = true;
 			StartSpriteCombine();
 			DrawCatenaryOnTunnel(ti);
@@ @@ -1089,7 +1087,7 @@ void DrawBridgeMiddle(const TileInfo* ti @@
 			StartSpriteCombine();
+		}
 	} else if (HasCatenary(GetRailType(rampsouth))) {
-		DrawCatenary(ti);
+		DrawCatenaryOnBridge(ti);
+	}
 	/* draw roof, the component of the bridge which is logically between the vehicle and the camera */

0 comments (0 inline, 0 general)