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

(svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore)

release/1.6
alberth 2015-04-11 18:45:18 +00:00
parent 9db21f6489
commit a91f74dbb3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/genworld.h
View File

@ -32,6 +32,17 @@ enum GenWorldMode {
GWM_HEIGHTMAP = 3, ///< Generate a newgame from a heightmap 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_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_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. static const uint CUSTOM_SEA_LEVEL_MAX_PERCENTAGE = 90; ///< Maximum percentage a user can specify for custom sea level.

4
src/table/settings.ini
View File

@ -2178,8 +2178,8 @@ type = SLE_UINT8
from = 30 from = 30
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 1 def = 1
min = 0 min = TGEN_SMOOTHNESS_BEGIN
max = 3 max = TGEN_SMOOTHNESS_END - 1
str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN
strhelp = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT strhelp = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT
strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH