Merge branch 'openttd'

src/table/settings/difficulty_settings.ini

@@ -83,7 +83,7 @@ var      = difficulty.industry_density
 type     = SLE_UINT8
 from     = SLV_97
 flags    = SF_GUI_DROPDOWN
-def      = ID_END - 1
+def      = ID_NORMAL
 min      = 0
 max      = ID_END - 1
 interval = 1

src/table/settings/world_settings.ini

@@ -271,6 +271,13 @@ min      = 1
 max      = 5000
 cat      = SC_BASIC
 
+[SDT_VAR]
+var      = game_creation.custom_industry_number
+type     = SLE_UINT16
+def      = 1
+min      = 1
+max      = 64000
+
 [SDT_VAR]
 var      = game_creation.custom_terrain_type
 type     = SLE_UINT8