diff options
| author | rubidium <rubidium@openttd.org> | 2007-09-08 09:52:02 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-09-08 09:52:02 +0000 |
| commit | c97804461eb696393a9bf4acc2f9b57738349066 (patch) | |
| tree | d8567cb4c3be776942b6892104b1373991293490 /src/road_cmd.cpp | |
| parent | 20a3b3796321a3b18a2cf6a270e63310ee185f51 (diff) | |
| download | openttd-c97804461eb696393a9bf4acc2f9b57738349066.tar.xz | |
(svn r11059) -Fix [FS#1182]: inconsistency between Rail<->ElRail conversions of different kinds of rail containing tiles (normal rail, stations, depots, etc). Patch by SmatZ.
Diffstat (limited to 'src/road_cmd.cpp')
| -rw-r--r-- | src/road_cmd.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 3dadf9e5d..cf2ae3638 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -543,18 +543,11 @@ CommandCost DoConvertStreetRail(TileIndex tile, RailType totype, bool exec) /* not a railroad crossing? */ if (!IsLevelCrossing(tile)) return CMD_ERROR; - /* not owned by me? */ - if (!CheckTileOwnership(tile) || !EnsureNoVehicleOnGround(tile)) return CMD_ERROR; - - if (GetRailType(tile) == totype) return CMD_ERROR; - - /* 'hidden' elrails can't be downgraded to normal rail when elrails are disabled */ - if (_patches.disable_elrails && totype == RAILTYPE_RAIL && GetRailType(tile) == RAILTYPE_ELECTRIC) return CMD_ERROR; - if (exec) { SetRailType(tile, totype); MarkTileDirtyByTile(tile); YapfNotifyTrackLayoutChange(tile, FindFirstTrack(GetCrossingRailBits(tile))); + VehicleFromPos(tile, &tile, UpdateTrainPowerProc); } return CommandCost(_price.build_rail / 2); |