diff options
| author | alberth <alberth@openttd.org> | 2015-04-11 18:45:18 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2015-04-11 18:45:18 +0000 |
| commit | a91f74dbb3513f77947decc514374c5a563999d3 (patch) | |
| tree | 9e80dd8cd566a7d0c8db1a76c86d2d391dc8741d | |
| parent | 9db21f64892104ca903397751d2b274572f4c58e (diff) | |
| download | openttd-a91f74dbb3513f77947decc514374c5a563999d3.tar.xz | |
(svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore)
| -rw-r--r-- | src/genworld.h | 11 | ||||
| -rw-r--r-- | src/table/settings.ini | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/genworld.h b/src/genworld.h index 267335423..ea3faa15f 100644 --- a/src/genworld.h +++ b/src/genworld.h @@ -32,6 +32,17 @@ enum GenWorldMode { GWM_HEIGHTMAP = 3, ///< Generate a newgame from a heightmap }; +/** Smoothness presets. */ +enum TgenSmoothness { + TGEN_SMOOTHNESS_BEGIN, ///< First smoothness value. + TGEN_SMOOTHNESS_VERY_SMOOTH = TGEN_SMOOTHNESS_BEGIN, ///< Smoothness preset 'very smooth'. + TGEN_SMOOTHNESS_SMOOTH, ///< Smoothness preset 'smooth'. + TGEN_SMOOTHNESS_ROUGH, ///< Smoothness preset 'rough'. + TGEN_SMOOTHNESS_VERY_ROUGH, ///< Smoothness preset 'very rough'. + + TGEN_SMOOTHNESS_END, ///< Used to iterate. +}; + static const uint CUSTOM_SEA_LEVEL_NUMBER_DIFFICULTY = 4; ///< Value for custom sea level in difficulty settings. static const uint CUSTOM_SEA_LEVEL_MIN_PERCENTAGE = 1; ///< Minimum percentage a user can specify for custom sea level. static const uint CUSTOM_SEA_LEVEL_MAX_PERCENTAGE = 90; ///< Maximum percentage a user can specify for custom sea level. diff --git a/src/table/settings.ini b/src/table/settings.ini index 24ad48632..f314f21e9 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -2178,8 +2178,8 @@ type = SLE_UINT8 from = 30 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY def = 1 -min = 0 -max = 3 +min = TGEN_SMOOTHNESS_BEGIN +max = TGEN_SMOOTHNESS_END - 1 str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN strhelp = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH |