mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11206) -Fix [FS#1299]: half tram bits could be removed in some cases. Based on patches by frosch and skidd13.

release/0.6
rubidium 2007-10-05 17:53:01 +00:00
parent cd1af1c870
commit a88d0a88b8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/road_cmd.cpp
View File

@ -836,10 +836,9 @@ static CommandCost ClearTile_Road(TileIndex tile, byte flags)
case ROAD_TILE_NORMAL: { case ROAD_TILE_NORMAL: {
RoadBits b = GetAllRoadBits(tile); RoadBits b = GetAllRoadBits(tile);
#define M(x) (1 << (x))
/* Clear the road if only one piece is on the tile OR the AI tries /* 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 */ * 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_AI_BUILDING) && IsTileOwner(tile, OWNER_TOWN)) ||
!(flags & DC_AUTO) !(flags & DC_AUTO)
) { ) {
@ -856,7 +855,6 @@ static CommandCost ClearTile_Road(TileIndex tile, byte flags)
} }
return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST); return_cmd_error(STR_1801_MUST_REMOVE_ROAD_FIRST);
} }
#undef M
case ROAD_TILE_CROSSING: { case ROAD_TILE_CROSSING: {
RoadTypes rts = GetRoadTypes(tile); RoadTypes rts = GetRoadTypes(tile);