diff options
| author | tron <tron@openttd.org> | 2006-07-15 09:29:39 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-07-15 09:29:39 +0000 |
| commit | 43b9204d42f7b01d37e3edea6c7b9b5162b1f215 (patch) | |
| tree | 0c092d388f0fba7a18944a1b7153ddb1b7513fe1 /rail_cmd.c | |
| parent | 26e1e8ce6175abf25afaa927de570035260c7b06 (diff) | |
| download | openttd-43b9204d42f7b01d37e3edea6c7b9b5162b1f215.tar.xz | |
(svn r5500) Undo r4597, because it breaks the intended change of r5315 to prohibit building rails on a road tile while road works are in progress
Diffstat (limited to 'rail_cmd.c')
| -rw-r--r-- | rail_cmd.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/rail_cmd.c b/rail_cmd.c index a8ed559ed..f5805dc9d 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -286,14 +286,16 @@ int32 CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (!EnsureNoVehicle(tile)) return CMD_ERROR; - if (GetRoadTileType(tile) == ROAD_TILE_NORMAL && - ((track == TRACK_X && GetRoadBits(tile) == ROAD_Y) || - (track == TRACK_Y && GetRoadBits(tile) == ROAD_X))) { - if (flags & DC_EXEC) { - MakeRoadCrossing(tile, GetTileOwner(tile), _current_player, (track == TRACK_X ? AXIS_Y : AXIS_X), p1, GetTownIndex(tile)); - } + if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) { + if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS); - break; + if ((track == TRACK_X && GetRoadBits(tile) == ROAD_Y) || + (track == TRACK_Y && GetRoadBits(tile) == ROAD_X)) { + if (flags & DC_EXEC) { + MakeRoadCrossing(tile, GetTileOwner(tile), _current_player, (track == TRACK_X ? AXIS_Y : AXIS_X), p1, GetTownIndex(tile)); + } + break; + } } if (IsLevelCrossing(tile) && GetCrossingRailBits(tile) == trackbit) { |