gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 22:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8074) -Fix (FS#537, r7555, r5749): revert r7555 because it was really wrong and fix the off-by-one error due to truncation that was supposedly fixed by r7555.

Browse Source
This commit is contained in:
rubidium 2007-01-12 08:37:14 +00:00
parent c3b56e0b3a
commit 5afd50017d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/heightmap.cpp
View File

@ -304,11 +304,11 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map)
if ((img_width * num_div) / img_height > ((width * num_div) / height)) { if ((img_width * num_div) / img_height > ((width * num_div) / height)) {
/* Image is wider than map - center vertically */ /* Image is wider than map - center vertically */
img_scale = (width * num_div) / img_width; img_scale = (width * num_div) / img_width;
row_pad = (height - ((img_height * img_scale) / num_div)) / 2; row_pad = (1 + height - ((img_height * img_scale) / num_div)) / 2;
} else { } else {
/* Image is taller than map - center horizontally */ /* Image is taller than map - center horizontally */
img_scale = (height * num_div) / img_height; img_scale = (height * num_div) / img_height;
col_pad = (width - ((img_width * img_scale) / num_div)) / 2; col_pad = (1 + width - ((img_width * img_scale) / num_div)) / 2;
} }
/* Form the landscape */ /* Form the landscape */
@ -322,8 +322,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 */ /* Check if current tile is within the 1-pixel map edge or padding regions */
if ((DistanceFromEdge(tile) <= 1) || if ((DistanceFromEdge(tile) <= 1) ||
(row < row_pad) || (row >= (img_height + row_pad)) || (row < row_pad) || (row >= (height - row_pad - 1)) ||
(col < col_pad) || (col >= (img_width + col_pad))) { (col < col_pad) || (col >= (width - col_pad - 1))) {
SetTileHeight(tile, 0); SetTileHeight(tile, 0);
} else { } else {
/* Use nearest neighbor resizing to scale map data. /* Use nearest neighbor resizing to scale map data.