Codechange: Convert saveload numbers to enum values.

(This was mostly achieved with a few in-place regexes)

7 files changed, 197 insertions, 197 deletions

diff --git a/src/table/company_settings.ini b/src/table/company_settings.ini
index 71b95cc39..a6e873f65 100644
--- a/src/table/company_settings.ini
+++ b/src/table/company_settings.ini
@@ -31,7 +31,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 
diff --git a/src/table/currency_settings.ini b/src/table/currency_settings.ini
index dede8b0fb..bcce65801 100644
--- a/src/table/currency_settings.ini
+++ b/src/table/currency_settings.ini
@@ -25,7 +25,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 
diff --git a/src/table/gameopt_settings.ini b/src/table/gameopt_settings.ini
index ef38b15ff..624d475c3 100644
--- a/src/table/gameopt_settings.ini
+++ b/src/table/gameopt_settings.ini
@@ -59,7 +59,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 
@@ -77,7 +77,7 @@ def      = 0
 min      = 0
 max      = 0
 full     = NULL
-to       = 4
+to       = SLV_4
 
 [SDTG_GENERAL]
 name     = ""diff_custom""
@@ -91,7 +91,7 @@ def      = 0
 min      = 0
 max      = 0
 full     = NULL
-from     = 4
+from     = SLV_4
 
 ##
 [SDTG_VAR]
@@ -152,21 +152,21 @@ type     = SLE_UINT8
 def      = DEF_SNOWLINE_HEIGHT * TILE_HEIGHT
 min      = MIN_SNOWLINE_HEIGHT * TILE_HEIGHT
 max      = MAX_SNOWLINE_HEIGHT * TILE_HEIGHT
-to       = 22
+to       = SLV_22
 
 [SDT_NULL]
 length   = 1
-from     = 22
-to       = 165
+from     = SLV_22
+to       = SLV_165
 
 [SDT_NULL]
 length   = 1
-to       = 23
+to       = SLV_23
 
 [SDTC_OMANY]
 var      = gui.autosave
 type     = SLE_UINT8
-from     = 23
+from     = SLV_23
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = 1
 max      = 4
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index 52ca2d16e..b710478fb 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -32,7 +32,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 0d3109ad5..2b36e32b7 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -89,7 +89,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 
@@ -101,7 +101,7 @@ cat      = SC_ADVANCED
 base     = GameSettings
 var      = difficulty.max_no_competitors
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 def      = 0
 min      = 0
 max      = MAX_COMPANIES - 1
@@ -111,14 +111,14 @@ cat      = SC_BASIC
 
 [SDT_NULL]
 length   = 1
-from     = 97
-to       = 110
+from     = SLV_97
+to       = SLV_110
 
 [SDT_VAR]
 base     = GameSettings
 var      = difficulty.number_towns
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_NEWGAME_ONLY
 def      = 2
 min      = 0
@@ -131,7 +131,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.industry_density
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING
 def      = ID_END - 1
 min      = 0
@@ -146,7 +146,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.max_loan
 type     = SLE_UINT32
-from     = 97
+from     = SLV_97
 guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_CURRENCY
 def      = 300000
 min      = 100000
@@ -161,7 +161,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.initial_interest
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = 2
 min      = 2
@@ -175,7 +175,7 @@ strval   = STR_CONFIG_SETTING_PERCENTAGE
 base     = GameSettings
 var      = difficulty.vehicle_costs
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_MULTISTRING
 def      = 0
 min      = 0
@@ -190,7 +190,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.competitor_speed
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
@@ -203,14 +203,14 @@ cat      = SC_BASIC
 
 [SDT_NULL]
 length   = 1
-from     = 97
-to       = 110
+from     = SLV_97
+to       = SLV_110
 
 [SDT_VAR]
 base     = GameSettings
 var      = difficulty.vehicle_breakdowns
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
@@ -225,7 +225,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.subsidy_multiplier
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
@@ -239,7 +239,7 @@ strval   = STR_SUBSIDY_X1_5
 base     = GameSettings
 var      = difficulty.construction_cost
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO | SGF_MULTISTRING
 def      = 0
 min      = 0
@@ -254,7 +254,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.terrain_type
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 1
 min      = 0
@@ -269,7 +269,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.quantity_sea_lakes
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_NEWGAME_ONLY
 def      = 0
 min      = 0
@@ -281,7 +281,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = difficulty.economy
-from     = 97
+from     = SLV_97
 def      = false
 str      = STR_CONFIG_SETTING_RECESSIONS
 strhelp  = STR_CONFIG_SETTING_RECESSIONS_HELPTEXT
@@ -289,7 +289,7 @@ strhelp  = STR_CONFIG_SETTING_RECESSIONS_HELPTEXT
 [SDT_BOOL]
 base     = GameSettings
 var      = difficulty.line_reverse_mode
-from     = 97
+from     = SLV_97
 def      = false
 str      = STR_CONFIG_SETTING_TRAIN_REVERSING
 strhelp  = STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT
@@ -297,7 +297,7 @@ strhelp  = STR_CONFIG_SETTING_TRAIN_REVERSING_HELPTEXT
 [SDT_BOOL]
 base     = GameSettings
 var      = difficulty.disasters
-from     = 97
+from     = SLV_97
 def      = false
 str      = STR_CONFIG_SETTING_DISASTERS
 strhelp  = STR_CONFIG_SETTING_DISASTERS_HELPTEXT
@@ -307,7 +307,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = difficulty.town_council_tolerance
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING
 def      = 0
 min      = 0
@@ -323,8 +323,8 @@ name     = ""diff_level""
 var      = _old_diff_level
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_CONFIG
-from     = 97
-to       = 178
+from     = SLV_97
+to       = SLV_178
 def      = 3
 min      = 0
 max      = 3
@@ -336,7 +336,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.town_name
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_NO_NETWORK
 def      = 0
 max      = 255
@@ -347,7 +347,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.landscape
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 0
 max      = 3
@@ -361,14 +361,14 @@ cat      = SC_BASIC
 ; Snow line (or snow_line_height * TILE_HEIGHT)
 [SDT_NULL]
 length   = 1
-from     = 97
-to       = 164
+from     = SLV_97
+to       = SLV_164
 
 [SDT_OMANY]
 base     = GameSettings
 var      = vehicle.road_side
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
 def      = 1
 max      = 1
@@ -384,7 +384,7 @@ proc     = CheckRoadSide
 base     = GameSettings
 var      = construction.max_heightlevel
 type     = SLE_UINT8
-from     = 194
+from     = SLV_194
 guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = DEF_MAX_HEIGHTLEVEL
 min      = MIN_MAX_HEIGHTLEVEL
@@ -407,7 +407,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.command_pause_level
 type     = SLE_UINT8
-from     = 154
+from     = SLV_154
 guiflags = SGF_MULTISTRING | SGF_NO_NETWORK
 def      = 1
 min      = 0
@@ -421,7 +421,7 @@ strval   = STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS
 base     = GameSettings
 var      = construction.terraform_per_64k_frames
 type     = SLE_UINT32
-from     = 156
+from     = SLV_156
 def      = 64 << 16
 min      = 0
 max      = 1 << 30
@@ -432,7 +432,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.terraform_frame_burst
 type     = SLE_UINT16
-from     = 156
+from     = SLV_156
 def      = 4096
 min      = 0
 max      = 1 << 30
@@ -443,7 +443,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.clear_per_64k_frames
 type     = SLE_UINT32
-from     = 156
+from     = SLV_156
 def      = 64 << 16
 min      = 0
 max      = 1 << 30
@@ -454,7 +454,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.clear_frame_burst
 type     = SLE_UINT16
-from     = 156
+from     = SLV_156
 def      = 4096
 min      = 0
 max      = 1 << 30
@@ -465,7 +465,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.tree_per_64k_frames
 type     = SLE_UINT32
-from     = 175
+from     = SLV_175
 def      = 64 << 16
 min      = 0
 max      = 1 << 30
@@ -476,7 +476,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.tree_frame_burst
 type     = SLE_UINT16
-from     = 175
+from     = SLV_175
 def      = 4096
 min      = 0
 max      = 1 << 30
@@ -486,7 +486,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = construction.autoslope
-from     = 75
+from     = SLV_75
 def      = true
 str      = STR_CONFIG_SETTING_AUTOSLOPE
 strhelp  = STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT
@@ -503,7 +503,7 @@ strhelp  = STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT
 base     = GameSettings
 var      = construction.max_bridge_length
 type     = SLE_UINT16
-from     = 159
+from     = SLV_159
 guiflags = SGF_NO_NETWORK
 def      = 64
 min      = 1
@@ -517,7 +517,7 @@ strval   = STR_CONFIG_SETTING_TILE_LENGTH
 base     = GameSettings
 var      = construction.max_bridge_height
 type     = SLE_UINT8
-from     = 194
+from     = SLV_194
 guiflags = SGF_NO_NETWORK
 def      = 12
 min      = 1
@@ -532,7 +532,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = construction.max_tunnel_length
 type     = SLE_UINT16
-from     = 159
+from     = SLV_159
 guiflags = SGF_NO_NETWORK
 def      = 64
 min      = 1
@@ -545,7 +545,7 @@ strval   = STR_CONFIG_SETTING_TILE_LENGTH
 # construction.longbridges
 [SDT_NULL]
 length   = 1
-to       = 159
+to       = SLV_159
 
 [SDT_VAR]
 base     = GameSettings
@@ -573,7 +573,7 @@ strhelp  = STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT
 base     = GameSettings
 var      = economy.town_layout
 type     = SLE_UINT8
-from     = 59
+from     = SLV_59
 guiflags = SGF_MULTISTRING
 def      = TL_ORIGINAL
 min      = TL_BEGIN
@@ -587,7 +587,7 @@ proc     = TownFoundingChanged
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.allow_town_roads
-from     = 113
+from     = SLV_113
 guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS
@@ -597,7 +597,7 @@ strhelp  = STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT
 base     = GameSettings
 var      = economy.found_town
 type     = SLE_UINT8
-from     = 128
+from     = SLV_128
 guiflags = SGF_MULTISTRING
 def      = TF_FORBIDDEN
 min      = TF_BEGIN
@@ -612,7 +612,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.allow_town_level_crossings
-from     = 143
+from     = SLV_143
 guiflags = SGF_NO_NETWORK
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS
@@ -624,7 +624,7 @@ strhelp  = STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT
 base     = GameSettings
 var      = linkgraph.recalc_interval
 type     = SLE_UINT16
-from     = 183
+from     = SLV_183
 def      = 4
 min      = 2
 max      = 32
@@ -637,7 +637,7 @@ strhelp  = STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT
 base     = GameSettings
 var      = linkgraph.recalc_time
 type     = SLE_UINT16
-from     = 183
+from     = SLV_183
 def      = 16
 min      = 1
 max      = 4096
@@ -650,7 +650,7 @@ strhelp  = STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT
 base     = GameSettings
 var      = linkgraph.distribution_pax
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 guiflags = SGF_MULTISTRING
 def      = DT_MANUAL
 min      = DT_MIN
@@ -664,7 +664,7 @@ strhelp  = STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT
 base     = GameSettings
 var      = linkgraph.distribution_mail
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 guiflags = SGF_MULTISTRING
 def      = DT_MANUAL
 min      = DT_MIN
@@ -678,7 +678,7 @@ strhelp  = STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT
 base     = GameSettings
 var      = linkgraph.distribution_armoured
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 guiflags = SGF_MULTISTRING
 def      = DT_MANUAL
 min      = DT_MIN
@@ -692,7 +692,7 @@ strhelp  = STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT
 base     = GameSettings
 var      = linkgraph.distribution_default
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 guiflags = SGF_MULTISTRING
 def      = DT_MANUAL
 min      = DT_BEGIN
@@ -706,7 +706,7 @@ strhelp  = STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT
 base     = GameSettings
 var      = linkgraph.accuracy
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 def      = 16
 min      = 2
 max      = 64
@@ -719,7 +719,7 @@ strhelp  = STR_CONFIG_SETTING_LINKGRAPH_ACCURACY_HELPTEXT
 base     = GameSettings
 var      = linkgraph.demand_distance
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 def      = 100
 min      = 0
 max      = 255
@@ -732,7 +732,7 @@ strhelp  = STR_CONFIG_SETTING_DEMAND_DISTANCE_HELPTEXT
 base     = GameSettings
 var      = linkgraph.demand_size
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 def      = 100
 min      = 0
 max      = 100
@@ -745,7 +745,7 @@ strhelp  = STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT
 base     = GameSettings
 var      = linkgraph.short_path_saturation
 type     = SLE_UINT8
-from     = 183
+from     = SLV_183
 def      = 80
 min      = 0
 max      = 250
@@ -774,7 +774,7 @@ proc     = TrainAccelerationModelChanged
 base     = GameSettings
 var      = vehicle.roadveh_acceleration_model
 type     = SLE_UINT8
-from     = 139
+from     = SLV_139
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
@@ -789,7 +789,7 @@ proc     = RoadVehAccelerationModelChanged
 base     = GameSettings
 var      = vehicle.train_slope_steepness
 type     = SLE_UINT8
-from     = 133
+from     = SLV_133
 def      = 3
 min      = 0
 max      = 10
@@ -804,7 +804,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = vehicle.roadveh_slope_steepness
 type     = SLE_UINT8
-from     = 139
+from     = SLV_139
 def      = 7
 min      = 0
 max      = 10
@@ -828,7 +828,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = vehicle.max_train_length
 type     = SLE_UINT8
-from     = 159
+from     = SLV_159
 def      = 7
 min      = 1
 max      = 64
@@ -841,13 +841,13 @@ cat      = SC_BASIC
 ; vehicle.mammoth_trains
 [SDT_NULL]
 length   = 1
-to       = 159
+to       = SLV_159
 
 [SDT_VAR]
 base     = GameSettings
 var      = vehicle.smoke_amount
 type     = SLE_UINT8
-from     = 145
+from     = SLV_145
 guiflags = SGF_MULTISTRING
 def      = 1
 min      = 0
@@ -859,7 +859,7 @@ strval   = STR_CONFIG_SETTING_NONE
 ; order.gotodepot
 [SDT_NULL]
 length   = 1
-to       = 159
+to       = SLV_159
 
 ; path finder
 
@@ -872,31 +872,31 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.new_pathfinding_all
-to       = 87
+to       = SLV_87
 def      = false
 cat      = SC_EXPERT
 
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.yapf.ship_use_yapf
-from     = 28
-to       = 87
+from     = SLV_28
+to       = SLV_87
 def      = false
 cat      = SC_EXPERT
 
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.yapf.road_use_yapf
-from     = 28
-to       = 87
+from     = SLV_28
+to       = SLV_87
 def      = true
 cat      = SC_EXPERT
 
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.yapf.rail_use_yapf
-from     = 28
-to       = 87
+from     = SLV_28
+to       = SLV_87
 def      = true
 cat      = SC_EXPERT
 
@@ -905,7 +905,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.pathfinder_for_trains
 type     = SLE_UINT8
-from     = 87
+from     = SLV_87
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 1
@@ -920,7 +920,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.pathfinder_for_roadvehs
 type     = SLE_UINT8
-from     = 87
+from     = SLV_87
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 1
@@ -935,7 +935,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.pathfinder_for_ships
 type     = SLE_UINT8
-from     = 87
+from     = SLV_87
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
@@ -1012,7 +1012,7 @@ name     = NULL
 guiflags = SGF_NO_NETWORK
 var      = _old_vds.servint_ispercent
 def      = false
-to       = 120
+to       = SLV_120
 
 [SDTG_VAR]
 name     = NULL
@@ -1022,7 +1022,7 @@ var      = _old_vds.servint_trains
 def      = 150
 min      = 5
 max      = 800
-to       = 120
+to       = SLV_120
 
 [SDTG_VAR]
 name     = NULL
@@ -1032,7 +1032,7 @@ var      = _old_vds.servint_roadveh
 def      = 150
 min      = 5
 max      = 800
-to       = 120
+to       = SLV_120
 
 [SDTG_VAR]
 name     = NULL
@@ -1042,7 +1042,7 @@ var      = _old_vds.servint_ships
 def      = 360
 min      = 5
 max      = 800
-to       = 120
+to       = SLV_120
 
 [SDTG_VAR]
 name     = NULL
@@ -1052,7 +1052,7 @@ var      = _old_vds.servint_aircraft
 def      = 150
 min      = 5
 max      = 800
-to       = 120
+to       = SLV_120
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1073,7 +1073,7 @@ proc     = UpdateConsists
 [SDT_BOOL]
 base     = GameSettings
 var      = vehicle.disable_elrails
-from     = 38
+from     = SLV_38
 guiflags = SGF_NO_NETWORK
 def      = false
 str      = STR_CONFIG_SETTING_DISABLE_ELRAILS
@@ -1085,7 +1085,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = vehicle.freight_trains
 type     = SLE_UINT8
-from     = 39
+from     = SLV_39
 guiflags = SGF_NO_NETWORK
 def      = 1
 min      = 1
@@ -1099,14 +1099,14 @@ proc     = UpdateConsists
 ; order.timetabling
 [SDT_NULL]
 length   = 1
-from     = 67
-to       = 159
+from     = SLV_67
+to       = SLV_159
 
 [SDT_VAR]
 base     = GameSettings
 var      = vehicle.plane_speed
 type     = SLE_UINT8
-from     = 90
+from     = SLV_90
 guiflags = SGF_NO_NETWORK
 def      = 4
 min      = 1
@@ -1118,7 +1118,7 @@ strval   = STR_CONFIG_SETTING_PLANE_SPEED_VALUE
 [SDT_BOOL]
 base     = GameSettings
 var      = vehicle.dynamic_engines
-from     = 95
+from     = SLV_95
 guiflags = SGF_NO_NETWORK
 def      = true
 proc     = ChangeDynamicEngines
@@ -1128,7 +1128,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = vehicle.plane_crashes
 type     = SLE_UINT8
-from     = 138
+from     = SLV_138
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
@@ -1142,12 +1142,12 @@ cat      = SC_BASIC
 ; station.join_stations
 [SDT_NULL]
 length   = 1
-to       = 159
+to       = SLV_159
 
 [SDTC_BOOL]
 var      = gui.sg_full_load_any
-from     = 22
-to       = 93
+from     = SLV_22
+to       = SLV_93
 def      = true
 
 [SDT_BOOL]
@@ -1165,14 +1165,14 @@ cat      = SC_EXPERT
 
 [SDTC_BOOL]
 var      = gui.sg_new_nonstop
-from     = 22
-to       = 93
+from     = SLV_22
+to       = SLV_93
 def      = false
 
 ; station.nonuniform_stations
 [SDT_NULL]
 length   = 1
-to       = 159
+to       = SLV_159
 
 [SDT_VAR]
 base     = GameSettings
@@ -1207,7 +1207,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = order.gradual_loading
-from     = 40
+from     = SLV_40
 guiflags = SGF_NO_NETWORK
 def      = true
 cat      = SC_EXPERT
@@ -1215,7 +1215,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = construction.road_stop_on_town_road
-from     = 47
+from     = SLV_47
 def      = true
 str      = STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD
 strhelp  = STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT
@@ -1224,7 +1224,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = construction.road_stop_on_competitor_road
-from     = 114
+from     = SLV_114
 def      = true
 str      = STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD
 strhelp  = STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT
@@ -1233,14 +1233,14 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = station.adjacent_stations
-from     = 62
+from     = SLV_62
 def      = true
 cat      = SC_EXPERT
 
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.station_noise_level
-from     = 96
+from     = SLV_96
 guiflags = SGF_NO_NETWORK
 def      = false
 str      = STR_CONFIG_SETTING_NOISE_LEVEL
@@ -1250,7 +1250,7 @@ proc     = InvalidateTownViewWindow
 [SDT_BOOL]
 base     = GameSettings
 var      = station.distant_join_stations
-from     = 106
+from     = SLV_106
 def      = true
 str      = STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS
 strhelp  = STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT
@@ -1283,7 +1283,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = construction.industry_platform
 type     = SLE_UINT8
-from     = 148
+from     = SLV_148
 def      = 1
 min      = 0
 max      = 4
@@ -1301,7 +1301,7 @@ strhelp  = STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT
 
 [SDT_NULL]
 length   = 1
-to       = 141
+to       = SLV_141
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1315,7 +1315,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.exclusive_rights
-from     = 79
+from     = SLV_79
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_EXCLUSIVE
 strhelp  = STR_CONFIG_SETTING_ALLOW_EXCLUSIVE_HELPTEXT
@@ -1325,7 +1325,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.fund_buildings
-from     = 165
+from     = SLV_165
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS
 strhelp  = STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS_HELPTEXT
@@ -1335,7 +1335,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.fund_roads
-from     = 160
+from     = SLV_160
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_FUND_ROAD
 strhelp  = STR_CONFIG_SETTING_ALLOW_FUND_ROAD_HELPTEXT
@@ -1345,7 +1345,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.give_money
-from     = 79
+from     = SLV_79
 def      = true
 str      = STR_CONFIG_SETTING_ALLOW_GIVE_MONEY
 strhelp  = STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT
@@ -1366,7 +1366,7 @@ cat      = SC_BASIC
 
 [SDT_NULL]
 length   = 4
-to       = 144
+to       = SLV_144
 
 [SDT_VAR]
 base     = GameSettings
@@ -1382,7 +1382,7 @@ cat      = SC_BASIC
 
 [SDT_NULL]
 length   = 4
-to       = 105
+to       = SLV_105
 
 [SDT_BOOL]
 base     = GameSettings
@@ -1405,7 +1405,7 @@ proc     = InvalidateCompanyWindow
 base     = GameSettings
 var      = economy.feeder_payment_share
 type     = SLE_UINT8
-from     = 134
+from     = SLV_134
 def      = 75
 min      = 0
 max      = 100
@@ -1418,7 +1418,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = economy.town_growth_rate
 type     = SLE_UINT8
-from     = 54
+from     = SLV_54
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
@@ -1431,7 +1431,7 @@ strval   = STR_CONFIG_SETTING_TOWN_GROWTH_NONE
 base     = GameSettings
 var      = economy.larger_towns
 type     = SLE_UINT8
-from     = 54
+from     = SLV_54
 guiflags = SGF_0ISDISABLED
 def      = 4
 min      = 0
@@ -1445,7 +1445,7 @@ strval   = STR_CONFIG_SETTING_LARGER_TOWNS_VALUE
 base     = GameSettings
 var      = economy.initial_city_size
 type     = SLE_UINT8
-from     = 56
+from     = SLV_56
 def      = 2
 min      = 1
 max      = 10
@@ -1457,20 +1457,20 @@ strval   = STR_JUST_COMMA
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.mod_road_rebuild
-from     = 77
+from     = SLV_77
 def      = true
 cat      = SC_EXPERT
 
 ; previously ai-new setting.
 [SDT_NULL]
 length   = 1
-to       = 107
+to       = SLV_107
 
 [SDT_OMANY]
 base     = GameSettings
 var      = script.settings_profile
 type     = SLE_UINT8
-from     = 178
+from     = SLV_178
 guiflags = SGF_MULTISTRING
 def      = SP_EASY
 min      = SP_EASY
@@ -1521,7 +1521,7 @@ strhelp  = STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT
 base     = GameSettings
 var      = script.script_max_opcode_till_suspend
 type     = SLE_UINT32
-from     = 107
+from     = SLV_107
 guiflags = SGF_NEWGAME_ONLY
 def      = 10000
 min      = 5000
@@ -1554,7 +1554,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.reverse_at_signals
-from     = 159
+from     = SLV_159
 def      = false
 str      = STR_CONFIG_SETTING_REVERSE_AT_SIGNALS
 strhelp  = STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT
@@ -1581,7 +1581,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = economy.town_noise_population[0]
 type     = SLE_UINT16
-from     = 96
+from     = SLV_96
 def      = 800
 min      = 200
 max      = 65535
@@ -1591,7 +1591,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = economy.town_noise_population[1]
 type     = SLE_UINT16
-from     = 96
+from     = SLV_96
 def      = 2000
 min      = 400
 max      = 65535
@@ -1601,7 +1601,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = economy.town_noise_population[2]
 type     = SLE_UINT16
-from     = 96
+from     = SLV_96
 def      = 4000
 min      = 800
 max      = 65535
@@ -1610,7 +1610,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = economy.infrastructure_maintenance
-from     = 166
+from     = SLV_166
 def      = false
 str      = STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE
 strhelp  = STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT
@@ -1622,7 +1622,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = pf.wait_for_pbs_path
 type     = SLE_UINT8
-from     = 100
+from     = SLV_100
 def      = 30
 min      = 2
 max      = 255
@@ -1631,7 +1631,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.reserve_paths
-from     = 100
+from     = SLV_100
 def      = false
 cat      = SC_EXPERT
 
@@ -1639,7 +1639,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.path_backoff_interval
 type     = SLE_UINT8
-from     = 100
+from     = SLV_100
 def      = 20
 min      = 1
 max      = 255
@@ -1741,7 +1741,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.npf.npf_rail_pbs_cross_penalty
 type     = SLE_UINT
-from     = 100
+from     = SLV_100
 def      = 3 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ -1751,7 +1751,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.npf.npf_rail_pbs_signal_back_penalty
 type     = SLE_UINT
-from     = 100
+from     = SLV_100
 def      = 15 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ -1797,7 +1797,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.npf.npf_road_drive_through_penalty
 type     = SLE_UINT
-from     = 47
+from     = SLV_47
 def      = 8 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ -1807,7 +1807,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.npf.npf_road_dt_occupied_penalty
 type     = SLE_UINT
-from     = 130
+from     = SLV_130
 def      = 8 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ -1817,7 +1817,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.npf.npf_road_bay_occupied_penalty
 type     = SLE_UINT
-from     = 130
+from     = SLV_130
 def      = 15 * NPF_TILE_LENGTH
 min      = 0
 max      = 100000
@@ -1827,7 +1827,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.npf.maximum_go_to_depot_penalty
 type     = SLE_UINT
-from     = 131
+from     = SLV_131
 def      = 20 * NPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1837,7 +1837,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.yapf.disable_node_optimization
-from     = 28
+from     = SLV_28
 def      = false
 cat      = SC_EXPERT
 
@@ -1845,7 +1845,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.max_search_nodes
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 10000
 min      = 500
 max      = 1000000
@@ -1854,7 +1854,7 @@ cat      = SC_EXPERT
 [SDT_BOOL]
 base     = GameSettings
 var      = pf.yapf.rail_firstred_twoway_eol
-from     = 28
+from     = SLV_28
 def      = false
 cat      = SC_EXPERT
 
@@ -1862,7 +1862,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_firstred_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 10 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1872,7 +1872,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_firstred_exit_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 100 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1882,7 +1882,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_lastred_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 10 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1892,7 +1892,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_lastred_exit_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 100 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1902,7 +1902,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_station_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 10 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1912,7 +1912,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_slope_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 2 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1922,7 +1922,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_curve45_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 1 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1932,7 +1932,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_curve90_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 6 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1942,7 +1942,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_depot_reverse_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 50 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1952,7 +1952,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_crossing_penalty
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 3 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -1962,7 +1962,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_look_ahead_max_signals
 type     = SLE_UINT
-from     = 28
+from     = SLV_28
 def      = 10
 min      = 1
 max      = 100
@@ -1972,7 +1972,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_look_ahead_signal_p0
 type     = SLE_INT
-from     = 28
+from     = SLV_28
 def      = 500
 min      = -1000000
 max      = 1000000
@@ -1982,7 +1982,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_look_ahead_signal_p1
 type     = SLE_INT
-from     = 28
+from     = SLV_28
 def      = -100
 min      = -1000000
 max      = 1000000
@@ -1992,7 +1992,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_look_ahead_signal_p2
 type     = SLE_INT
-from     = 28
+from     = SLV_28
 def      = 5
 min      = -1000000
 max      = 1000000
@@ -2002,7 +2002,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_pbs_cross_penalty
 type     = SLE_UINT
-from     = 100
+from     = SLV_100
 def      = 3 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2012,7 +2012,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_pbs_station_penalty
 type     = SLE_UINT
-from     = 100
+from     = SLV_100
 def      = 8 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2022,7 +2022,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_pbs_signal_back_penalty
 type     = SLE_UINT
-from     = 100
+from     = SLV_100
 def      = 15 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2032,7 +2032,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_doubleslip_penalty
 type     = SLE_UINT
-from     = 100
+from     = SLV_100
 def      = 1 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2042,7 +2042,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_longer_platform_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 8 * YAPF_TILE_LENGTH
 min      = 0
 max      = 20000
@@ -2052,7 +2052,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_longer_platform_per_tile_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 0 * YAPF_TILE_LENGTH
 min      = 0
 max      = 20000
@@ -2062,7 +2062,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_shorter_platform_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 40 * YAPF_TILE_LENGTH
 min      = 0
 max      = 20000
@@ -2072,7 +2072,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.rail_shorter_platform_per_tile_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 0 * YAPF_TILE_LENGTH
 min      = 0
 max      = 20000
@@ -2082,7 +2082,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_slope_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 2 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2092,7 +2092,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_curve_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 1 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2102,7 +2102,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_crossing_penalty
 type     = SLE_UINT
-from     = 33
+from     = SLV_33
 def      = 3 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2112,7 +2112,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_stop_penalty
 type     = SLE_UINT
-from     = 47
+from     = SLV_47
 def      = 8 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2122,7 +2122,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_stop_occupied_penalty
 type     = SLE_UINT
-from     = 130
+from     = SLV_130
 def      = 8 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2132,7 +2132,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.road_stop_bay_occupied_penalty
 type     = SLE_UINT
-from     = 130
+from     = SLV_130
 def      = 15 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2142,7 +2142,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = pf.yapf.maximum_go_to_depot_penalty
 type     = SLE_UINT
-from     = 131
+from     = SLV_131
 def      = 20 * YAPF_TILE_LENGTH
 min      = 0
 max      = 1000000
@@ -2153,7 +2153,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = game_creation.land_generator
 type     = SLE_UINT8
-from     = 30
+from     = SLV_30
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 1
 min      = 0
@@ -2166,7 +2166,7 @@ strval   = STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL
 base     = GameSettings
 var      = game_creation.oil_refinery_limit
 type     = SLE_UINT8
-from     = 30
+from     = SLV_30
 def      = 32
 min      = 12
 max      = 48
@@ -2178,7 +2178,7 @@ strhelp  = STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT
 base     = GameSettings
 var      = game_creation.tgen_smoothness
 type     = SLE_UINT8
-from     = 30
+from     = SLV_30
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 1
 min      = TGEN_SMOOTHNESS_BEGIN
@@ -2192,7 +2192,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.variety
 type     = SLE_UINT8
-from     = 197
+from     = SLV_197
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 0
 min      = 0
@@ -2205,7 +2205,7 @@ strval   = STR_VARIETY_NONE
 base     = GameSettings
 var      = game_creation.generation_seed
 type     = SLE_UINT32
-from     = 30
+from     = SLV_30
 def      = GENERATE_NEW_SEED
 min      = 0
 max      = UINT32_MAX
@@ -2215,7 +2215,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = game_creation.tree_placer
 type     = SLE_UINT8
-from     = 30
+from     = SLV_30
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = 2
 min      = 0
@@ -2273,7 +2273,7 @@ cat      = SC_BASIC
 [SDT_BOOL]
 base     = GameSettings
 var      = construction.freeform_edges
-from     = 111
+from     = SLV_111
 def      = true
 proc     = CheckFreeformEdges
 cat      = SC_EXPERT
@@ -2282,7 +2282,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = game_creation.water_borders
 type     = SLE_UINT8
-from     = 111
+from     = SLV_111
 def      = 15
 min      = 0
 max      = 16
@@ -2291,7 +2291,7 @@ max      = 16
 base     = GameSettings
 var      = game_creation.custom_town_number
 type     = SLE_UINT16
-from     = 115
+from     = SLV_115
 def      = 1
 min      = 1
 max      = 5000
@@ -2301,7 +2301,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = construction.extra_tree_placement
 type     = SLE_UINT8
-from     = 132
+from     = SLV_132
 guiflags = SGF_MULTISTRING
 def      = 2
 min      = 0
@@ -2315,7 +2315,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.custom_sea_level
 type     = SLE_UINT8
-from     = 149
+from     = SLV_149
 def      = 1
 min      = 2
 max      = 90
@@ -2325,7 +2325,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = game_creation.min_river_length
 type     = SLE_UINT8
-from     = 163
+from     = SLV_163
 def      = 16
 min      = 2
 max      = 255
@@ -2335,7 +2335,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = game_creation.river_route_random
 type     = SLE_UINT8
-from     = 163
+from     = SLV_163
 def      = 5
 min      = 1
 max      = 255
@@ -2345,7 +2345,7 @@ cat      = SC_EXPERT
 base     = GameSettings
 var      = game_creation.amount_of_rivers
 type     = SLE_UINT8
-from     = 163
+from     = SLV_163
 guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
 def      = 2
 min      = 0
@@ -2360,7 +2360,7 @@ strval   = STR_RIVERS_NONE
 base     = GameSettings
 var      = locale.currency
 type     = SLE_UINT8
-from     = 97
+from     = SLV_97
 flags    = SLF_NO_NETWORK_SYNC
 def      = 0
 max      = CURRENCY_END - 1
@@ -2372,8 +2372,8 @@ cat      = SC_BASIC
 name     = ""units""
 var      = _old_units
 type     = SLE_UINT8
-from     = 97
-to       = 184
+from     = SLV_97
+to       = SLV_184
 flags    = SLF_NOT_IN_CONFIG
 def      = 1
 max      = 2
@@ -2385,7 +2385,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = locale.units_velocity
 type     = SLE_UINT8
-from     = 184
+from     = SLV_184
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
@@ -2401,7 +2401,7 @@ strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL
 base     = GameSettings
 var      = locale.units_power
 type     = SLE_UINT8
-from     = 184
+from     = SLV_184
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
@@ -2417,7 +2417,7 @@ strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL
 base     = GameSettings
 var      = locale.units_weight
 type     = SLE_UINT8
-from     = 184
+from     = SLV_184
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
@@ -2433,7 +2433,7 @@ strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL
 base     = GameSettings
 var      = locale.units_volume
 type     = SLE_UINT8
-from     = 184
+from     = SLV_184
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
@@ -2449,7 +2449,7 @@ strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL
 base     = GameSettings
 var      = locale.units_force
 type     = SLE_UINT8
-from     = 184
+from     = SLV_184
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 2
@@ -2465,7 +2465,7 @@ strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL
 base     = GameSettings
 var      = locale.units_height
 type     = SLE_UINT8
-from     = 184
+from     = SLV_184
 flags    = SLF_NO_NETWORK_SYNC
 guiflags = SGF_MULTISTRING
 def      = 1
@@ -2481,7 +2481,7 @@ strval   = STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL
 base     = GameSettings
 var      = locale.digit_group_separator
 type     = SLE_STRQ
-from     = 118
+from     = SLV_118
 flags    = SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = RedrawScreen
@@ -2491,7 +2491,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = locale.digit_group_separator_currency
 type     = SLE_STRQ
-from     = 118
+from     = SLV_118
 flags    = SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = RedrawScreen
@@ -2501,7 +2501,7 @@ cat      = SC_BASIC
 base     = GameSettings
 var      = locale.digit_decimal_separator
 type     = SLE_STRQ
-from     = 126
+from     = SLV_126
 flags    = SLF_NO_NETWORK_SYNC
 def      = NULL
 proc     = RedrawScreen
diff --git a/src/table/win32_settings.ini b/src/table/win32_settings.ini
index 70c18a424..bb241f50c 100644
--- a/src/table/win32_settings.ini
+++ b/src/table/win32_settings.ini
@@ -30,7 +30,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
 
diff --git a/src/table/window_settings.ini b/src/table/window_settings.ini
index ad77423d9..41223586a 100644
--- a/src/table/window_settings.ini
+++ b/src/table/window_settings.ini
@@ -26,7 +26,7 @@ strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
 proc     = NULL
 load     = NULL
-from     = 0
+from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED