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

(svn r15380) -Fix (r15190)[FS#2603]: Do not use TileY() on negative TileIndexDiffs. But the test was not needed anyway, as those tiles were already tested in previous iterations.

release/0.7
frosch 2009-02-06 20:24:44 +00:00
parent 25a5178aaf
commit 5a369e1b50
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/town_cmd.cpp
View File

@ -716,7 +716,7 @@ static RoadBits GetTownRoadBits(TileIndex tile)
} }
/** /**
* Check if a neighboring tile has a road * Check if certain neighboring tiles have a road in a specific direction
* *
* @param tile curent tile * @param tile curent tile
* @param dir target direction * @param dir target direction
@ -726,6 +726,8 @@ static RoadBits GetTownRoadBits(TileIndex tile)
*/ */
static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dist_multi) static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dist_multi)
{ {
if (!IsValidTile(tile)) return false;
/* Lookup table for the used diff values */ /* Lookup table for the used diff values */
const TileIndexDiff tid_lt[3] = { const TileIndexDiff tid_lt[3] = {
TileOffsByDiagDir(ChangeDiagDir(dir, DIAGDIRDIFF_90RIGHT)), TileOffsByDiagDir(ChangeDiagDir(dir, DIAGDIRDIFF_90RIGHT)),
@ -747,7 +749,9 @@ static bool IsNeighborRoadTile(TileIndex tile, const DiagDirection dir, uint dis
if (pos & 2) cur += tid_lt[2]; if (pos & 2) cur += tid_lt[2];
cur = (uint)(pos / 4) * cur; // Multiply for the fitting distance cur = (uint)(pos / 4) * cur; // Multiply for the fitting distance
if (IsValidTile(tile + TileXY(TileX(cur) / 2, TileY(cur) / 2)) && IsValidTile(tile + cur) && GetTownRoadBits(TILE_ADD(tile, cur)) & DiagDirToRoadBits((pos & 2) ? dir : ReverseDiagDir(dir))) return true;
if (IsValidTile(tile + cur) &&
GetTownRoadBits(TILE_ADD(tile, cur)) & DiagDirToRoadBits((pos & 2) ? dir : ReverseDiagDir(dir))) return true;
} }
return false; return false;
} }