cpp/openttd-patchpack/source Changeset - r15745:c8cd29be35a0

Changeset - r15745:c8cd29be35a0

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

frosch - 14 years ago 2010-08-09 07:30:50
frosch@openttd.org

(svn r20422) -Change [FS#3947]: Resolve tracksprites on bridges always using the southern bridgehead as tile.

3 files changed with 4 insertions and 4 deletions:

src/elrail.cpp

src/newgrf_spritegroup.h

src/tunnelbridge_cmd.cpp

0 comments (0 inline, 0 general)

src/elrail.cpp

➞

Show inline comments

@@ @@ -500,20 +500,20 @@ void DrawCatenaryOnBridge(const TileInfo @@
 		/* Draw "long" wires on all other tiles of the bridge (one pylon every two tiles) */
 		sss = &CatenarySpriteData[WIRE_X_FLAT_SW + (num % 2) + offset];
+	}
 	height = GetBridgeHeight(end);
-	SpriteID wire_base = GetWireBase(start);
+	SpriteID wire_base = GetWireBase(end);
 	AddSortableSpriteToDraw(wire_base + sss->image_offset, PAL_NONE, ti->x + sss->x_offset, ti->y + sss->y_offset,
 		sss->x_size, sss->y_size, sss->z_size, height + sss->z_offset,
 		IsTransparencySet(TO_CATENARY)
 	);
-	SpriteID pylon_base = GetPylonBase(start);
+	SpriteID pylon_base = GetPylonBase(end);
 	/* Finished with wires, draw pylons
 	 * every other tile needs a pylon on the northern end */
 	if (num % 2) {
 		DiagDirection PCPpos = (axis == AXIS_X ? DIAGDIR_NE : DIAGDIR_NW);
 		Direction PPPpos = (axis == AXIS_X ? DIR_NW : DIR_NE);

src/newgrf_spritegroup.h

➞

Show inline comments

@@ @@ -343,13 +343,13 @@ struct ResolverObject { @@
 			uint8 distance;
 			AIConstructionEvent event;
 			uint8 count;
 			uint8 station_size;
 		} generic;
 		struct {
 			TileIndex tile;
+			TileIndex tile;                ///< Tracktile. For track on a bridge this is the southern bridgehead.
 			TileContext context;           ///< Are we resolving sprites for the upper halftile, or on a bridge?
 		} routes;
 		struct {
 			const struct Station *st;      ///< Station of the airport for which the callback is run, or NULL for build gui.
 			byte airport_id;               ///< Type of airport for which the callback is run
 			byte layout;                   ///< Layout of the airport to build.

src/tunnelbridge_cmd.cpp

➞

Show inline comments

@@ @@ -1250,13 +1250,13 @@ void DrawBridgeMiddle(const TileInfo *ti @@
 			EndSpriteCombine();
 			StartSpriteCombine();
+		}
 	} else if (transport_type == TRANSPORT_RAIL) {
 		const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(rampsouth));
 		if (rti->UsesOverlay()) {
-			SpriteID surface = GetCustomRailSprite(rti, ti->tile, RTSG_BRIDGE);
+			SpriteID surface = GetCustomRailSprite(rti, rampsouth, RTSG_BRIDGE);
 			if (surface != 0) {
 				AddSortableSpriteToDraw(surface + axis, PAL_NONE, x, y, 16, 16, 0, bridge_z, IsTransparencySet(TO_BRIDGES));
+			}
+		}
 		EndSpriteCombine();

0 comments (0 inline, 0 general)