summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2015-04-11 18:44:26 +0000
committeralberth <alberth@openttd.org>2015-04-11 18:44:26 +0000
commit9db21f64892104ca903397751d2b274572f4c58e (patch)
treed875666fbab5487e6ee1032a1821380258ba677e /src
parentf29842316e91ca8d020dc0ec26161f239769f7e7 (diff)
downloadopenttd-9db21f64892104ca903397751d2b274572f4c58e.tar.xz
(svn r27230) -Fix: Tune down terrain generation to reduce amount of long slopes (chillcore)
Diffstat (limited to 'src')
-rw-r--r--src/tgp.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tgp.cpp b/src/tgp.cpp
index b4d1aa30c..ffc3edc51 100644
--- a/src/tgp.cpp
+++ b/src/tgp.cpp
@@ -213,6 +213,7 @@ static const amplitude_t _water_percent[4] = {70, 170, 270, 420};
* Gets the maximum allowed height while generating a map based on
* mapsize, terraintype, and the maximum height level.
* @return The maximum height for the map generation.
+ * @note Values should never be lower than 3 since the minimum snowline height is 2.
*/
static height_t TGPGetMaxHeight()
{
@@ -228,11 +229,11 @@ static height_t TGPGetMaxHeight()
*/
static const int max_height[5][MAX_MAP_SIZE_BITS - MIN_MAP_SIZE_BITS + 1] = {
/* 64 128 256 512 1024 2048 4096 */
- { 3, 3, 5, 5, 5, 5, 5 }, ///< Very flat
- { 4, 4, 6, 10, 10, 10, 10 }, ///< Flat
- { 6, 9, 15, 25, 31, 31, 31 }, ///< Hilly
- { 7, 12, 23, 42, 78, 85, 85 }, ///< Mountainous
- { 12, 21, 36, 73, 146, 170, 170 } ///< Alpinist
+ { 3, 3, 3, 3, 4, 5, 7 }, ///< Very flat
+ { 5, 7, 8, 9, 14, 19, 31 }, ///< Flat
+ { 8, 9, 10, 15, 23, 37, 61 }, ///< Hilly
+ { 10, 11, 17, 19, 49, 63, 73 }, ///< Mountainous
+ { 12, 19, 25, 31, 67, 75, 87 }, ///< Alpinist
};
int max_height_from_table = max_height[_settings_game.difficulty.terrain_type][min(MapLogX(), MapLogY()) - MIN_MAP_SIZE_BITS];