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

(svn r26905) -Change: account for the maximum map height when converting heightmaps

release/1.5
rubidium 2014-09-21 18:29:18 +00:00
parent 03b731f929
commit 26239c3d89
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/heightmap.cpp
View File

@ -364,8 +364,16 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map)
assert(img_row < img_height); assert(img_row < img_height);
assert(img_col < img_width); assert(img_col < img_width);
/* Colour scales from 0 to 255, OpenTTD height scales from 0 to 15 */ /* The height in 1/255ths. */
SetTileHeight(tile, map[img_row * img_width + img_col] / 16); uint heightmap_height = map[img_row * img_width + img_col];
/* The height in 1/255ths of the maximum height. */
heightmap_height *= _settings_game.construction.max_heightlevel;
/* Scaling should not alter the coastline, thus values in the interval ]0..1] result in a heightlevel of 1 */
if (IsInsideMM(heightmap_height, 1, UINT8_MAX)) heightmap_height = UINT8_MAX;
SetTileHeight(tile, heightmap_height / UINT8_MAX);
} }
/* Only clear the tiles within the map area. */ /* Only clear the tiles within the map area. */
if (IsInnerTile(tile)) { if (IsInnerTile(tile)) {