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

(svn r15381) -Fix (r11091): When testing for parallel road two tiles away, do not move more than one tile along the road.

release/0.7
frosch 2009-02-06 20:51:24 +00:00
parent 5a369e1b50
commit c52680a131
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/town_cmd.cpp
View File

@ -716,13 +716,14 @@ static RoadBits GetTownRoadBits(TileIndex tile)
} }
/** /**
* Check if certain neighboring tiles have a road in a specific direction * Check for parallel road inside a given distance.
* Assuming a road from (tile - TileOffsByDiagDir(dir)) to tile,
* is there a parallel road left or right of it within distance dist_multi?
* *
* @param tile curent tile * @param tile curent tile
* @param dir target direction * @param dir target direction
* @param dist_multi distance multiplyer * @param dist_multi distance multiplyer
* @return true if one of the neighboring tiles at the * @return true if there is a parallel road
* given distance is a road tile else false
*/ */
static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dist_multi) static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dist_multi)
{ {
@ -735,21 +736,15 @@ static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dis
TileOffsByDiagDir(ReverseDiagDir(dir)), TileOffsByDiagDir(ReverseDiagDir(dir)),
}; };
/* We add 1 to the distance because we want to get 1 for
* the min distance multiplyer and not 0.
* Therefore we start at 4. The 4 is used because
* there are 4 tiles per distance step to check. */
dist_multi = (dist_multi + 1) * 4; dist_multi = (dist_multi + 1) * 4;
for (uint pos = 4; pos < dist_multi; pos++) { for (uint pos = 4; pos < dist_multi; pos++) {
TileIndexDiff cur = 0; /* Go (pos / 4) tiles to the left or the right */
/* For each even value of pos add the right TileIndexDiff TileIndexDiff cur = tid_lt[(pos & 1) ? 0 : 1] * (pos / 4);
* for each uneven value the left TileIndexDiff
* for each with 2nd bit set (2,3,6,7,..) add the reversed TileIndexDiff */ /* Use the current tile as origin, or go one tile backwards */
cur += tid_lt[(pos & 1) ? 0 : 1];
if (pos & 2) cur += tid_lt[2]; if (pos & 2) cur += tid_lt[2];
cur = (uint)(pos / 4) * cur; // Multiply for the fitting distance /* Test for roadbit parallel to dir and facing towards the middle axis */
if (IsValidTile(tile + cur) && if (IsValidTile(tile + cur) &&
GetTownRoadBits(TILE_ADD(tile, cur)) & DiagDirToRoadBits((pos & 2) ? dir : ReverseDiagDir(dir))) return true; GetTownRoadBits(TILE_ADD(tile, cur)) & DiagDirToRoadBits((pos & 2) ? dir : ReverseDiagDir(dir))) return true;
} }