Merge branch 'master' into improved_breakdowns

2015-08-15 23:34:48 +01:00
parent 80d52eb20e 8cfc1e9d23
commit 6d695a1426
200 changed files with 10552 additions and 3678 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2187,8 +2187,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