diff options
| author | celestar <celestar@openttd.org> | 2005-01-20 09:12:20 +0000 |
|---|---|---|
| committer | celestar <celestar@openttd.org> | 2005-01-20 09:12:20 +0000 |
| commit | fea6e43b7c983281476ba1b69f54a8a33feb66a9 (patch) | |
| tree | fb6ae5cc23f30a9c645121dd573e3caf4f30fc0d | |
| parent | f017a27eebee6394b70ccfa34f3b7bb1ac283215 (diff) | |
| download | openttd-fea6e43b7c983281476ba1b69f54a8a33feb66a9.tar.xz | |
(svn r1574) -Fix [ 1105281 ] upgrade rail fails when train under bridge
| -rw-r--r-- | tunnelbridge_cmd.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c index 307ab5aee..e6ae13b89 100644 --- a/tunnelbridge_cmd.c +++ b/tunnelbridge_cmd.c @@ -864,17 +864,25 @@ int32 DoConvertTunnelBridgeRail(uint tile, uint totype, bool exec) } else if ((_map5[tile]&0xC6) == 0x80) { uint starttile; int32 cost; + uint z = TilePixelHeight(tile); + + z += 8; if (!CheckTileOwnership(tile)) return CMD_ERROR; // railway bridge starttile = tile = FindEdgesOfBridge(tile, &endtile); // Make sure there's no vehicle on the bridge - if ((v=FindVehicleBetween(tile, endtile, 0xff)) != NULL) { + if ((v=FindVehicleBetween(tile, endtile, z)) != NULL) { VehicleInTheWayErrMsg(v); return CMD_ERROR; } + if (!EnsureNoVehicle(starttile) || !EnsureNoVehicle(endtile)) { + _error_message = STR_8803_TRAIN_IN_THE_WAY; + return CMD_ERROR; + } + if ( (uint)(_map3_lo[tile] & 0xF) == totype) return CMD_ERROR; cost = 0; do { |