Merge remote-tracking branch 'upstream/1.11' into 1.11

2021-04-01 17:33:31 +03:00
parent 14f71187eb ec1f91e865
commit 93d8111960
125 changed files with 2828 additions and 1149 deletions
@@ -368,7 +368,7 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map)
 					/* 0 is sea level.
 					 * Other grey scales are scaled evenly to the available height levels > 0.
 					 * (The coastline is independent from the number of height levels) */
-					heightmap_height = 1 + (heightmap_height - 1) * _settings_game.construction.max_heightlevel / 255;
+					heightmap_height = 1 + (heightmap_height - 1) * _settings_game.game_creation.heightmap_height / 255;
 				}

 				SetTileHeight(tile, heightmap_height);