From d2a725ec949c23b89187e9616ce63e7cb59154f4 Mon Sep 17 00:00:00 2001 From: smatz Date: Wed, 4 Feb 2009 01:07:53 +0000 Subject: [PATCH] (svn r15332) -Fix (r15190): terrain generated from heightmaps always was at sea level at both southern borders --- src/heightmap.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/heightmap.cpp b/src/heightmap.cpp index 27d247bfa4..b9614e5955 100644 --- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -331,8 +331,8 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map) /* Check if current tile is within the 1-pixel map edge or padding regions */ if ((!_settings_game.construction.freeform_edges && DistanceFromEdge(tile) <= 1) || - (row < row_pad) || (row >= (height - row_pad - 1)) || - (col < col_pad) || (col >= (width - col_pad - 1))) { + (row < row_pad) || (row >= (height - row_pad - (_settings_game.construction.freeform_edges ? 0 : 1))) || + (col < col_pad) || (col >= (width - col_pad - (_settings_game.construction.freeform_edges ? 0 : 1)))) { SetTileHeight(tile, 0); } else { /* Use nearest neighbor resizing to scale map data.