diff options
| author | frosch <frosch@openttd.org> | 2008-02-14 15:59:16 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-02-14 15:59:16 +0000 |
| commit | 514df81e27398309532f7523ee1c7df86fe3043d (patch) | |
| tree | a43464406df621d20a7dd83755ef86ae3474e9ea /src/station_cmd.cpp | |
| parent | 6c932166414ac0164fc53658b880d5b05a9d7a7e (diff) | |
| download | openttd-514df81e27398309532f7523ee1c7df86fe3043d.tar.xz | |
(svn r12141) -Codechange: Introduce IsNormalRoad[Tile](), IsRoadDepot[Tile]() and HasTileRoadType(); and use them.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index bef1c1cf3..b2219c1cb 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1333,7 +1333,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { bool type = HasBit(p2, 0); bool is_drive_through = HasBit(p2, 1); - bool build_over_road = is_drive_through && IsTileType(tile, MP_ROAD) && GetRoadTileType(tile) == ROAD_TILE_NORMAL; + bool build_over_road = is_drive_through && IsNormalRoadTile(tile); bool town_owned_road = build_over_road && IsTileOwner(tile, OWNER_TOWN); RoadTypes rts = (RoadTypes)GB(p2, 2, 3); @@ -1356,7 +1356,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /* Not allowed to build over this road */ if (build_over_road) { if (IsTileOwner(tile, OWNER_TOWN) && !_patches.road_stop_on_town_road) return_cmd_error(STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD); - if (GetRoadTileType(tile) != ROAD_TILE_NORMAL) return CMD_ERROR; RoadTypes cur_rts = GetRoadTypes(tile); @@ -2946,8 +2945,8 @@ static CommandCost ClearTile_Station(TileIndex tile, byte flags) switch (GetStationType(tile)) { case STATION_RAIL: return_cmd_error(STR_300B_MUST_DEMOLISH_RAILROAD); case STATION_AIRPORT: return_cmd_error(STR_300E_MUST_DEMOLISH_AIRPORT_FIRST); - case STATION_TRUCK: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_CARGO_TRAM_STATION : STR_3047_MUST_DEMOLISH_TRUCK_STATION); - case STATION_BUS: return_cmd_error(HasBit(GetRoadTypes(tile), ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION : STR_3046_MUST_DEMOLISH_BUS_STATION); + case STATION_TRUCK: return_cmd_error(HasTileRoadType(tile, ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_CARGO_TRAM_STATION : STR_3047_MUST_DEMOLISH_TRUCK_STATION); + case STATION_BUS: return_cmd_error(HasTileRoadType(tile, ROADTYPE_TRAM) ? STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION : STR_3046_MUST_DEMOLISH_BUS_STATION); case STATION_BUOY: return_cmd_error(STR_306A_BUOY_IN_THE_WAY); case STATION_DOCK: return_cmd_error(STR_304D_MUST_DEMOLISH_DOCK_FIRST); case STATION_OILRIG: |