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

(svn r18937) -Fix (r15190): TileAddWrap didn't return INVALID_TILE for void tiles at the north border

release/1.0
yexo 2010-01-28 19:27:10 +00:00
parent 8ee96d4d45
commit 6be4560528
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map.cpp
View File

@ -115,9 +115,11 @@ TileIndex TileAddWrap(TileIndex tile, int addx, int addy)
uint x = TileX(tile) + addx; uint x = TileX(tile) + addx;
uint y = TileY(tile) + addy; uint y = TileY(tile) + addy;
/* Disallow void tiles at the north border. */
if (_settings_game.construction.freeform_edges && (x == 0 || y == 0)) return INVALID_TILE;
/* Are we about to wrap? */ /* Are we about to wrap? */
if (x < MapMaxX() && y < MapMaxY()) if (x < MapMaxX() && y < MapMaxY()) return tile + TileDiffXY(addx, addy);
return tile + TileDiffXY(addx, addy);
return INVALID_TILE; return INVALID_TILE;
} }