Merge branch 'master' into jgrpp

# Conflicts:
#	src/group_cmd.cpp
#	src/lang/korean.txt
#	src/lang/simplified_chinese.txt
#	src/script/api/script_rail.cpp
#	src/tunnelbridge_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-23 19:10:07 +00:00
79 changed files with 181 additions and 237 deletions

View File

@@ -1493,7 +1493,7 @@ static uint CalculateCoverageLine(uint coverage, uint edge_multiplier)
}
/* The amount of land we have is the map size minus the first (sea) layer. */
uint land_tiles = MapSizeX() * MapSizeY() - histogram[0];
uint land_tiles = MapSize() - histogram[0];
int best_score = land_tiles;
/* Our goal is the coverage amount of the land-mass. */