# HG changeset patch
# User yexo <yexo@openttd.org>
# Date 1264706830 0
# Node ID 95da7391b13ee6cdb0153aec06f70db35fc67990
# Parent  18378caba43681762aea66d8257888996617f418
(svn r18937) -Fix (r15190): TileAddWrap didn't return INVALID_TILE for void tiles at the north border

diff --git a/src/map.cpp b/src/map.cpp
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -115,9 +115,11 @@
 	uint x = TileX(tile) + addx;
 	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? */
-	if (x < MapMaxX() && y < MapMaxY())
-		return tile + TileDiffXY(addx, addy);
+	if (x < MapMaxX() && y < MapMaxY()) return tile + TileDiffXY(addx, addy);
 
 	return INVALID_TILE;
 }