cpp/openttd-patchpack/source Changeset - r3368:52d24cbaae76

Changeset - r3368:52d24cbaae76

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

celestar - 18 years ago 2006-03-30 09:26:17
celestar@openttd.org

(svn r4165) -Do not use GetBridgeAxis on bridge ramps (request by Tron)

1 file changed with 5 insertions and 2 deletions:

elrail.c

0 comments (0 inline, 0 general)

elrail.c

➞

Show inline comments

@@ @@ -95,7 +95,7 @@ static TrackBits GetRailTrackBitsUnivers @@
 				} else {
 					if (override != NULL && DistanceMax(t, GetOtherBridgeEnd(t)) > 1) *override = 1 << GetBridgeRampDirection(t);
-					return GetBridgeAxis(t) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y;
+					return DiagDirToAxis(GetBridgeRampDirection(t)) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y;
+				}
+			}
 		case MP_STREET:
@@ @@ -196,7 +196,10 @@ static void DrawCatenaryRailway(const Ti @@
 		/* Read the foundataions if they are present, and adjust the tileh */
 		if (IsTileType(neighbour, MP_RAILWAY)) foundation = GetRailFoundation(tileh[TS_NEIGHBOUR], trackconfig[TS_NEIGHBOUR]);
 		if (IsBridgeTile(neighbour) && IsBridgeRamp(neighbour)) foundation = GetBridgeFoundation(tileh[TS_NEIGHBOUR], GetBridgeAxis(neighbour));
 		if (IsBridgeTile(neighbour) && IsBridgeRamp(neighbour)) {
 			foundation = GetBridgeFoundation(tileh[TS_NEIGHBOUR], DiagDirToAxis(GetBridgeRampDirection(neighbour)));
+		}
 		if (foundation != 0) {
 			if (foundation < 15) {
 				tileh[TS_NEIGHBOUR] = 0;

0 comments (0 inline, 0 general)