cpp/openttd-patchpack/source Changeset - r4022:e0e40de48d5c

Changeset - r4022:e0e40de48d5c

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 18 years ago 2006-06-14 09:52:50
tron@openttd.org

(svn r5260) -Fix: It was possible to convert the railtype of a bridge while a train was on it

1 file changed with 1 insertions and 2 deletions:

tunnelbridge_cmd.c

0 comments (0 inline, 0 general)

tunnelbridge_cmd.c

➞

Show inline comments

@@ @@ -785,22 +785,21 @@ int32 DoConvertTunnelBridgeRail(TileInde @@
 			// notify YAPF about the track layout change
 			for (tracks = GetRailBitsUnderBridge(tile); tracks != TRACK_BIT_NONE; tracks = KILL_FIRST_BIT(tracks))
 				YapfNotifyTrackLayoutChange(tile, FIND_FIRST_BIT(tracks));
+		}
 		return _price.build_rail >> 1;
 	} else if (IsBridge(tile) && IsBridgeRamp(tile) && GetBridgeTransportType(tile) == TRANSPORT_RAIL) {
 		uint z = TilePixelHeight(tile) + TILE_HEIGHT;
 		const Vehicle* v;
 		TileIndexDiff delta;
 		int32 cost;
 		if (!CheckTileOwnership(tile)) return CMD_ERROR;
 		endtile = GetOtherBridgeEnd(tile);
 		// Make sure there's no vehicle on the bridge
-		v = FindVehicleBetween(tile, endtile, z);
+		v = FindVehicleBetween(tile, endtile, GetBridgeHeightRamp(tile));
 		if (v != NULL) {
 			return_cmd_error(VehicleInTheWayErrMsg(v));
+		}
 		if (!EnsureNoVehicle(tile) || !EnsureNoVehicle(endtile)) {
 			return_cmd_error(STR_8803_TRAIN_IN_THE_WAY);

0 comments (0 inline, 0 general)