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

(svn r11130) -Fix [FS#1207]: towns build roads that weren't connected to any other road.

release/0.6
rubidium 2007-09-19 18:15:59 +00:00
parent fa628f0363
commit 5d4311c07a
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/town_cmd.cpp
View File

@ -814,32 +814,38 @@ static RoadBits GetTownRoadGridElement(Town* t, TileIndex tile, DiagDirection di
break; break;
} }
/* Skip slope optimisations */ /* Stop if the tile is not a part of the grid lines */
if (rcmd == ROAD_NONE) return rcmd; if (rcmd == ROAD_NONE) return rcmd;
RoadBits rb_template; /* Optimise only X-junctions */
switch (GetTileSlope(tile, NULL)) { if (COUNTBITS(rcmd) != 2) {
default: rb_template = ROAD_ALL; break; RoadBits rb_template;
case SLOPE_W: rb_template = ROAD_NW | ROAD_SW; break;
case SLOPE_SW: rb_template = ROAD_Y | ROAD_SW; break; switch (GetTileSlope(tile, NULL)) {
case SLOPE_S: rb_template = ROAD_SE | ROAD_SW; break; default: rb_template = ROAD_ALL; break;
case SLOPE_SE: rb_template = ROAD_X | ROAD_SE; break; case SLOPE_W: rb_template = ROAD_NW | ROAD_SW; break;
case SLOPE_E: rb_template = ROAD_NE | ROAD_SE; break; case SLOPE_SW: rb_template = ROAD_Y | ROAD_SW; break;
case SLOPE_NE: rb_template = ROAD_Y | ROAD_NE; break; case SLOPE_S: rb_template = ROAD_SW | ROAD_SE; break;
case SLOPE_N: rb_template = ROAD_NW | ROAD_NE; break; case SLOPE_SE: rb_template = ROAD_X | ROAD_SE; break;
case SLOPE_NW: rb_template = ROAD_X | ROAD_NW; break; case SLOPE_E: rb_template = ROAD_SE | ROAD_NE; break;
case SLOPE_STEEP_W: case SLOPE_NE: rb_template = ROAD_Y | ROAD_NE; break;
case SLOPE_STEEP_S: case SLOPE_N: rb_template = ROAD_NE | ROAD_NW; break;
case SLOPE_STEEP_E: case SLOPE_NW: rb_template = ROAD_X | ROAD_NW; break;
case SLOPE_STEEP_N: case SLOPE_STEEP_W:
rb_template = (dir == DIAGDIR_NE || dir == DIAGDIR_SW) ? ROAD_X : ROAD_Y; case SLOPE_STEEP_S:
break; case SLOPE_STEEP_E:
case SLOPE_STEEP_N:
rb_template = ROAD_NONE;
break;
}
/* Stop if the template is compatible to the growth dir */
if (DiagDirToRoadBits(ReverseDiagDir(dir)) & rb_template) return rb_template;
/* If not generate a straight road in the direction of the growth */
return DiagDirToRoadBits(dir) | DiagDirToRoadBits(ReverseDiagDir(dir));
} }
/* Check for the right growth dir */ return rcmd;
if (DiagDirToRoadBits(ReverseDiagDir(dir)) & (rcmd & rb_template)) return rb_template & rcmd;
return (dir == DIAGDIR_NE || dir == DIAGDIR_SW) ? ROAD_X : ROAD_Y;
} }
/** /**