Merge branch 'master' into enhanced_viewport_overlay

Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h

src/table/settings.ini

@@ -28,6 +28,7 @@ static bool TownFoundingChanged(int32 p1);
 static bool DifficultyNoiseChange(int32 i);
 static bool MaxNoAIsChange(int32 i);
 static bool CheckRoadSide(int p1);
+static bool ChangeMaxHeightLevel(int32 p1);
 static bool CheckFreeformEdges(int32 p1);
 static bool ChangeDynamicEngines(int32 p1);
 static bool StationCatchmentChanged(int32 p1);
@@ -40,6 +41,7 @@ static bool RedrawTownAuthority(int32 p1);
 static bool InvalidateCompanyInfrastructureWindow(int32 p1);
 static bool InvalidateCompanyWindow(int32 p1);
 static bool ZoomMinMaxChanged(int32 p1);
+static bool MaxVehiclesChanged(int32 p1);
 
 #ifdef ENABLE_NETWORK
 static bool UpdateClientName(int32 p1);
@@ -382,7 +384,7 @@ base     = GameSettings
 var      = construction.max_heightlevel
 type     = SLE_UINT8
 from     = 194
-guiflags = SGF_NEWGAME_ONLY | SGF_NO_NETWORK
+guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
 def      = DEF_MAX_HEIGHTLEVEL
 min      = MIN_MAX_HEIGHTLEVEL
 max      = MAX_MAX_HEIGHTLEVEL
@@ -390,6 +392,7 @@ interval = 1
 str      = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL
 strhelp  = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT
 strval   = STR_JUST_INT
+proc     = ChangeMaxHeightLevel
 cat      = SC_BASIC
 
 [SDT_BOOL]
@@ -959,7 +962,7 @@ max      = 5000
 str      = STR_CONFIG_SETTING_MAX_TRAINS
 strhelp  = STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT
 strval   = STR_JUST_COMMA
-proc     = RedrawScreen
+proc     = MaxVehiclesChanged
 cat      = SC_BASIC
 
 [SDT_VAR]
@@ -972,7 +975,7 @@ max      = 5000
 str      = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES
 strhelp  = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT
 strval   = STR_JUST_COMMA
-proc     = RedrawScreen
+proc     = MaxVehiclesChanged
 cat      = SC_BASIC
 
 [SDT_VAR]
@@ -985,7 +988,7 @@ max      = 5000
 str      = STR_CONFIG_SETTING_MAX_AIRCRAFT
 strhelp  = STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT
 strval   = STR_JUST_COMMA
-proc     = RedrawScreen
+proc     = MaxVehiclesChanged
 cat      = SC_BASIC
 
 [SDT_VAR]
@@ -998,7 +1001,7 @@ max      = 5000
 str      = STR_CONFIG_SETTING_MAX_SHIPS
 strhelp  = STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT
 strval   = STR_JUST_COMMA
-proc     = RedrawScreen
+proc     = MaxVehiclesChanged
 cat      = SC_BASIC
 
 [SDTG_BOOL]
@@ -2175,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
@@ -3612,12 +3615,12 @@ strval   = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
 
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
-var      = gui.network_chat_box_width
+var      = gui.network_chat_box_width_pct
 type     = SLE_UINT16
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = 620
-min      = 200
-max      = 65535
+def      = 40
+min      = 10
+max      = 100
 cat      = SC_EXPERT
 
 [SDTC_VAR]