mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11206) -Fix [FS#1299]: half tram bits could be removed in some cases. Based on patches by frosch and skidd13.
This commit is contained in:
parent
cd1af1c870
commit
a88d0a88b8
|
@ -836,10 +836,9 @@ static CommandCost ClearTile_Road(TileIndex tile, byte flags)
|
|||
case ROAD_TILE_NORMAL: {
|
||||
RoadBits b = GetAllRoadBits(tile);
|
||||
|
||||
#define M(x) (1 << (x))
|
||||
/* Clear the road if only one piece is on the tile OR the AI tries
|
||||
* to clear town road OR we are not using the DC_AUTO flag */
|
||||
if ((M(b) & (M(ROAD_NW) | M(ROAD_SW) | M(ROAD_SE) | M(ROAD_NE))) ||
|
||||
if ((COUNTBITS(b) == 1 && GetRoadBits(tile, ROADTYPE_TRAM) == ROAD_NONE) ||
|
||||
((flags & DC_AI_BUILDING) && IsTileOwner(tile, OWNER_TOWN)) ||
|
||||
!(flags & DC_AUTO)
|
||||
) {
|
||||
|
@ -856,7 +855,6 @@ static CommandCost ClearTile_Road(TileIndex tile, byte flags)
|
|||
}
|
||||
return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
|
||||
}
|
||||
#undef M
|
||||
|
||||
case ROAD_TILE_CROSSING: {
|
||||
RoadTypes rts = GetRoadTypes(tile);
|
||||
|
|
Loading…
Reference in New Issue